Paul Davis
b188033bf7
rather hacky fix for the change of the SyncSource > JACK enum to SyncSource > Engine
...
This is needed in order to get ardour started if ardour.rc names "JACK" as the sync source
2013-09-20 14:30:50 -04:00
Paul Davis
960a47330a
switch from JACK_Slave to Engine_Slave
2013-09-19 17:34:23 -04:00
Paul Davis
66aa6dfc8e
remove file (this moved to libs/backends/jack as part of the audioengine changes)
2013-09-19 16:27:03 -04:00
Paul Davis
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
Paul Davis
57d24608e7
show a different audio/MIDI option screen if JACK is already running. try to fix problem with using AudioBackend::<property-value>() functions before anything has been set.
2013-09-19 15:03:20 -04:00
John Emmas
cb18f914bd
'libs/ardour' - Further compiler specific changes
2013-09-18 12:28:08 +01:00
John Emmas
4f8c30de02
'libs/ardour' - Further platform specific changes
2013-09-18 12:27:39 +01:00
John Emmas
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
John Emmas
e5c426ed41
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
2013-09-18 10:16:40 +01:00
John Emmas
dc3288565b
'libs/ardour' - Clarify ambiguous symbols (needs to be checked)
2013-09-18 10:11:54 +01:00
John Emmas
10047037be
'libs/ardour/async_midi_port.cc' - Add a missing header file
2013-09-18 10:03:41 +01:00
John Emmas
6b1261ed30
'libs/gtkmm2ext/idle_adjustment.cc' - Add a missing header file
2013-09-18 10:02:20 +01:00
Paul Davis
fd23ebd088
Merge branch 'master' into cairocanvas
2013-09-17 21:23:30 -04:00
Paul Davis
302b08c059
Merge branch 'master' into windows
2013-09-17 21:22:56 -04:00
Paul Davis
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
nick_m
914ba475de
actually load new state after creating a session.
2013-09-18 02:02:31 +10:00
Paul Davis
32452bb3b3
fix crash caused by trying to unregister null ports
2013-09-17 10:01:02 -04:00
Paul Davis
5e0e41e068
Merge branch 'master' into cairocanvas
2013-09-16 22:11:50 -04:00
Paul Davis
fb45fdc052
fix conflicts and merge with master
2013-09-16 22:11:06 -04:00
Paul Davis
710ee36eaa
a few DEBUG_TRACE improvements
2013-09-16 22:02:36 -04:00
Paul Davis
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
Paul Davis
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
Paul Davis
7cc451d81d
fix language issue
2013-09-16 10:07:52 -04:00
Paul Davis
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
Paul Davis
31157cb343
fix ordering in session construction so that new sessions and existing ones both work
2013-09-16 09:57:22 -04:00
Paul Davis
045ef69ac3
Merge branch 'master' into cairocanvas
2013-09-14 16:43:02 -04:00
Paul Davis
a1a5c779c6
fix change in waf uselib name for libardour vs. master
2013-09-14 16:42:42 -04:00
Paul Davis
7a30e63eaa
fix merge conflicts with master
2013-09-14 16:42:40 -04:00
Paul Davis
bde50d5396
really fix build issues after removal of "using" directives
2013-09-14 16:34:08 -04:00
Paul Davis
0da34e65e3
Merge branch 'master' into windows
2013-09-14 16:24:46 -04:00
Paul Davis
25b9e266eb
fix build issues after removal of "using" directives
2013-09-14 16:24:21 -04:00
Paul Davis
60da662aff
Merge branch 'master' into windows
2013-09-14 16:21:32 -04:00
Paul Davis
f5191e6257
cerr output when JACK halt callback is executed
2013-09-14 16:18:17 -04:00
Paul Davis
76a08ad9e9
fix return value from thread creation function when not connected to JACK
2013-09-14 16:17:49 -04:00
Paul Davis
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
Paul Davis
5cf1f7f3b2
Merge branch 'master' into windows
2013-09-13 12:35:10 -04:00
Paul Davis
dce6b71e82
use visibility control on JACK audio backend, so that we can import this change into windows branch
2013-09-13 12:32:50 -04:00
Paul Davis
4861eca974
Merge branch 'master' into windows
2013-09-13 11:55:56 -04:00
Paul Davis
83a826095d
update JACK backend to use new inheritance structure for AudioBackend
2013-09-13 11:21:43 -04:00
Paul Davis
f9d08daa47
change inheritance so that an AudioBackend IS-A PortEngine
...
This allows a derived (concrete) implementation to share information (e.g. sample rate, buffer size)
between the audio backend side of things and the port management side of things.
2013-09-13 11:21:15 -04:00
Paul Davis
b085a79938
explanatory comment
2013-09-13 10:19:01 -04:00
Paul Davis
ccc81f05be
remove some debug output messages
2013-09-12 17:25:01 -04:00
Paul Davis
28d692b490
don't stop metering thread when session is removed; move engine-setup code into its own method. sorry, ardour build-from-source folk :)
2013-09-12 17:25:01 -04:00
Paul Davis
7c88670680
lots of changes to auto-start (and stop) the backend for latency measurements, and continuing work on the session construction/engine configuration flow
2013-09-12 16:28:51 -04:00
Paul Davis
9af75b2ac9
reinstate unblocking-of-connections in session setup, accidentally dropped in reorganization work
2013-09-12 16:27:58 -04:00
Paul Davis
6b3907d57f
change names, add comment, improve return type to avoid extra call to get EngineControl::State*
2013-09-12 12:26:59 -04:00
Paul Davis
c985a64d58
merge with master and fix Searchpath conflict
2013-09-12 11:40:56 -04:00
Paul Davis
4a6412aebe
merge with master
2013-09-12 11:32:09 -04:00
Paul Davis
4df3666738
add AudioBackendNativeThread to serve the same role as jack_native_thread_t
2013-09-12 11:29:47 -04:00
Paul Davis
bb826f4bee
incomplete merge of master into windows (requires upcoming changes to master to be complete)
2013-09-12 11:28:50 -04:00
