13
0
Commit Graph

11729 Commits

Author SHA1 Message Date
a88f38cf10 'gtk2_ardour (msvc)' - Some changes needed before anything at all will compile
For the most part, the compilation problems are caused by lines such as:-

      WM::Proxy<ThemeManager> theme_manager;

Before MSVC will compile the above it needs to know that the specified object type contains an appropriate (i.e. publicly available) default c'tor. Therefore the corresponding header file needs to get #included, rather than just declaring that type to be a class (whilst all classes have a default c'tor, it needn't necessarily be public). The remaining changes are mostly minor.

This commit should be tested ASAP to make sure it doesn't upset the other compilers.
2013-09-26 10:58:07 +01:00
70dcf7878b Define 'suseconds_t' which isn't normally defined for Windows 2013-09-25 15:56:01 +01:00
17ad0a0b61 Merge branch 'cairocanvas' into windows+cc 2013-09-25 15:52:11 +01:00
18850253e9 only generate some current canvas debug output when CANVAS_DEBUG is defined, to quieten things down 2013-09-25 10:38:04 -04:00
67bb9a732a add casting for MSVC sqrt 2013-09-25 10:36:42 -04:00
3ba0ef7192 fix a typo in canvas-debug.h 2013-09-25 10:36:21 -04:00
19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
	gtk2_ardour/marker.cc
	gtk2_ardour/midi_region_view.h
	gtk2_ardour/region_gain_line.h
	gtk2_ardour/utils.cc
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/wscript
	libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
66aa6dfc8e remove file (this moved to libs/backends/jack as part of the audioengine changes) 2013-09-19 16:27:03 -04:00
7b96fab60e move configure-time dependency on PortAudio out of libs/ardour and into libs/backends/jack
PortAudio is currently used to get a list of device names for use with JACK on Windows.
We should find a better way to do this that avoids this kind of dependency.
2013-09-19 16:24:51 -04:00
cb18f914bd 'libs/ardour' - Further compiler specific changes 2013-09-18 12:28:08 +01:00
4f8c30de02 'libs/ardour' - Further platform specific changes 2013-09-18 12:27:39 +01:00
b5da5a1af0 'libs/ardour' - Use 'std::vector' to implement an array whose size is unknown (required to be buildable with MSVC) 2013-09-18 12:25:36 +01:00
e5c426ed41 Merge branch 'windows' of git.ardour.org:ardour/ardour into windows 2013-09-18 10:16:40 +01:00
dc3288565b 'libs/ardour' - Clarify ambiguous symbols (needs to be checked) 2013-09-18 10:11:54 +01:00
10047037be 'libs/ardour/async_midi_port.cc' - Add a missing header file 2013-09-18 10:03:41 +01:00
6b1261ed30 'libs/gtkmm2ext/idle_adjustment.cc' - Add a missing header file 2013-09-18 10:02:20 +01:00
fd23ebd088 Merge branch 'master' into cairocanvas 2013-09-17 21:23:30 -04:00
302b08c059 Merge branch 'master' into windows 2013-09-17 21:22:56 -04:00
402d92889a minor code changes 2013-09-17 21:22:22 -04:00
f51537b71d substantive changes to allow the audio/MIDI setup dialog to change settings as intended
So far only tested with JACK backend, but expected to be more correct for other backends too
2013-09-17 21:09:13 -04:00
7eda429155 remove JACK related action definitions (audio/MIDI setup is where this happens now) 2013-09-17 21:07:44 -04:00
c698ada035 change return type on {disconnect_from,reconnect_to}_engine() and make public so that we can use these when doing intentional disconnects without popping up the "HALTED" dialog 2013-09-17 21:07:14 -04:00
b7c15bc9fd remove JACK related menu items (audio/MIDI setup is where this happens now) 2013-09-17 21:06:15 -04:00
7381390565 add basic display of existing MIDI ports to audio/MIDI setup 2013-09-17 10:01:24 -04:00
32452bb3b3 fix crash caused by trying to unregister null ports 2013-09-17 10:01:02 -04:00
1740bbb966 correctly restore zoom focus state after restart (from nick mainsbridge) 2013-09-16 22:32:55 -04:00
5e0e41e068 Merge branch 'master' into cairocanvas 2013-09-16 22:11:50 -04:00
fb45fdc052 fix conflicts and merge with master 2013-09-16 22:11:06 -04:00
c8b32e2f8b minor fixups for audio/MIDI setup spin buttons (now editable, as they should be) 2013-09-16 22:03:59 -04:00
61b98d3e9f check for an existing PublicEditor instance AFTER attempting to handle a key press in a window that has called relay_key_press(), so that normal key handling works there (e.g. audio/MIDI setup) 2013-09-16 22:03:27 -04:00
710ee36eaa a few DEBUG_TRACE improvements 2013-09-16 22:02:36 -04:00
cb31e34a5c end latency detection if AMS window closed while running detection (plus some non-functioning changes to try to get spinbutton text entry to work 2013-09-16 18:47:30 -04:00
2a3dfb5e82 various bits of polish for the latency tab of audio/midi setup dialog 2013-09-16 15:21:32 -04:00
39ee88b3f9 more session construction order changes, and removal of n_physical_{inputs,outputs} members which were (a) not initialized early enough (b) not used anywhere except monitor bus connection.
Things almost make sense now.
2013-09-16 12:08:19 -04:00
ed61a9ebbd update buffer size duration (msecs) while displaying saved audio/MIDI setup state 2013-09-16 11:10:05 -04:00
910755b51b fix missing initialization of two Session members, which fixes a crash during quit-without-finished-session 2013-09-16 10:23:37 -04:00
4d503c2053 commit some logic problems with the EngineDialog when change the driver/device name combos 2013-09-16 10:18:25 -04:00
7cc451d81d fix language issue 2013-09-16 10:07:52 -04:00
7c8f3adc75 allow waf to handle inconsistent case where cwiid.h is present but not the pkg-config file 2013-09-16 10:07:27 -04:00
31157cb343 fix ordering in session construction so that new sessions and existing ones both work 2013-09-16 09:57:22 -04:00
045ef69ac3 Merge branch 'master' into cairocanvas 2013-09-14 16:43:02 -04:00
a1a5c779c6 fix change in waf uselib name for libardour vs. master 2013-09-14 16:42:42 -04:00
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
bde50d5396 really fix build issues after removal of "using" directives 2013-09-14 16:34:08 -04:00
0da34e65e3 Merge branch 'master' into windows 2013-09-14 16:24:46 -04:00
25b9e266eb fix build issues after removal of "using" directives 2013-09-14 16:24:21 -04:00
60da662aff Merge branch 'master' into windows 2013-09-14 16:21:32 -04:00
f5191e6257 cerr output when JACK halt callback is executed 2013-09-14 16:18:17 -04:00
76a08ad9e9 fix return value from thread creation function when not connected to JACK 2013-09-14 16:17:49 -04:00
6b23417ae0 move creation of Graph till after we have the engine running, since we need access to the backend 2013-09-14 16:17:24 -04:00