Paul Davis
4209e8a834
add new static functions to get SR and disk sample format from session XML
2013-09-23 21:35:51 -04:00
Paul Davis
20f28c82ec
make session creation from a template work again
2013-09-22 11:19:34 -04:00
Paul Davis
f7586f3a0d
likely fix for creating new sessions from templates
2013-09-21 12:50:45 -04:00
Paul Davis
3e5c1e3fc1
Revert "actually load new state after creating a session."
...
This reverts commit 914ba475de .
Unclear why I applied this or what it was supposed to do. A new session has no
state.
2013-09-20 16:16:30 -04:00
Paul Davis
eb3cc04eff
Merge branch 'master' of https://github.com/nmains/ardour
2013-09-20 15:21:14 -04:00
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
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
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
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
bde50d5396
really fix build issues after removal of "using" directives
2013-09-14 16:34:08 -04:00
Paul Davis
25b9e266eb
fix build issues after removal of "using" directives
2013-09-14 16:24:21 -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
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
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
4df3666738
add AudioBackendNativeThread to serve the same role as jack_native_thread_t
2013-09-12 11:29:47 -04:00
Paul Davis
9f2ab81df6
always add a timeout value of 200msec to jack, just like qjackctl does.
...
THIS IS A HACK. LONG TERM GOAL: understand why ardour gets zombified on the way up.
2013-09-11 21:00:21 -04:00
Paul Davis
f85b362351
*maybe* fix issues with zombification during session loading
2013-09-11 16:33:40 -04:00
Paul Davis
91e2eab01a
make use of measured latency values to set dialog controls, and use actual port latency to compute extra delay
2013-09-11 13:02:32 -04:00
Paul Davis
18c4c9656a
remove some configure time tests from libs/ardour regarding JACK which are no longer relevant
2013-09-11 12:44:21 -04:00
Paul Davis
7c3535ebf8
make quit work even when latency measurement is in progress
2013-09-11 10:06:02 -04:00
Paul Davis
7c719e441a
fix handling of new session
...
defer save state till after everything done in post_engine_init() is complete.
2013-09-11 09:59:56 -04:00
Paul Davis
d305dc1e0c
more tweaks to latency measurement
...
don't open ports till absolutely necessary (store names for future use).
tidy up parts of the dialog (tab)
2013-09-10 23:25:15 -04:00
Paul Davis
676ff80697
basic functionality for hardware latency measurement
2013-09-10 22:58:33 -04:00
Paul Davis
209e4bdcae
many changes relating to session construction and audioengine interaction
...
every session member is now initialized using C++ constructor syntax
session construction reordered to clarify the split(s) between work
where the engine is not relevant and work where is it is. this
split is still not 100% obvious, but is enormously clearer than
previously.
if engine/backend are not running as session is created, and the SR
of the sample rate is known, attempt to force backend to that value.
2013-09-10 15:41:19 -04:00
Paul Davis
19d05fa436
start reordering of Session initialization
...
the goal is to allow a clear demarcation of where we need
the audioengine and have existing data parameters (e.g. sample rate)
for the session so that we can coerce the engine (if possible)
to match to session values.
also, to rationalize construction even more and use C++
constructor syntax as much as possible.
2013-09-09 22:40:54 -04:00
Paul Davis
bea5434639
fix name of control app for Delta1010
2013-09-09 21:35:47 -04:00
Paul Davis
2a89234027
move control app launching back into audio backend to allow ASIO/CoreAudio model to work; push initial state of AMS dialog to backend
...
Issues remain with the basic model of the AMS dialog - when is
newly chosen state pushed into the backend (which can then
modify the control app button sensitivity. This is a special
problem for this button because APIs like ASIO and CoreAudio
probably don't allow us to launch a control app for an arbitrary
device, but only one actually in use. In this sense it is
different from properties like available buffer size etc, where
we can typically query without actually using the device.
2013-09-09 21:23:12 -04:00
Paul Davis
29c9d94dbe
fix control app breakage
2013-09-09 18:06:44 -04:00
Paul Davis
f06bab1fa3
add envy24 control app name
2013-09-09 17:10:33 -04:00
Paul Davis
ecfeeda4b8
launching control app is now responsibility of ardour GUI, not audio backend; use ARDOUR_DEVICE_CONTROL_APP if set in the environment
2013-09-09 16:48:27 -04:00
Paul Davis
f06187735d
initial work on adding access to h/w control apps when ardour starts JACK
2013-09-09 15:17:43 -04:00
Paul Davis
a228643e40
add can_change_{sample_rate,buffer_size}_while_running() methods to an AudioBackend
...
Allows the GUI and other stuff to know whether or not changing the SR/bufsize is possible while running, which is about to become useful
2013-09-09 15:17:43 -04:00
Paul Davis
56465fda10
move engine dialog from a widget to an actual dialog; emit Session::AudioEngineSetupRequired when loading a session if it is necessary
2013-09-09 15:17:42 -04:00