13
0
Commit Graph

5568 Commits

Author SHA1 Message Date
c985a64d58 merge with master and fix Searchpath conflict 2013-09-12 11:40:56 -04:00
4a6412aebe merge with master 2013-09-12 11:32:09 -04:00
4df3666738 add AudioBackendNativeThread to serve the same role as jack_native_thread_t 2013-09-12 11:29:47 -04:00
bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
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
f85b362351 *maybe* fix issues with zombification during session loading 2013-09-11 16:33:40 -04:00
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
18c4c9656a remove some configure time tests from libs/ardour regarding JACK which are no longer relevant 2013-09-11 12:44:21 -04:00
7c3535ebf8 make quit work even when latency measurement is in progress 2013-09-11 10:06:02 -04:00
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
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
676ff80697 basic functionality for hardware latency measurement 2013-09-10 22:58:33 -04:00
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
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
bea5434639 fix name of control app for Delta1010 2013-09-09 21:35:47 -04:00
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
29c9d94dbe fix control app breakage 2013-09-09 18:06:44 -04:00
f06bab1fa3 add envy24 control app name 2013-09-09 17:10:33 -04:00
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
f06187735d initial work on adding access to h/w control apps when ardour starts JACK 2013-09-09 15:17:43 -04:00
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
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
5ec69e2374 move inadvertently moved jack_slave.cc back to its rightful spot 2013-09-07 13:39:36 -04:00
f96652e12a other changes for separated jack backend 2013-09-07 11:13:07 -04:00
f4cf283f26 move JACK audio backend to its own folder and adjust build system to reflect that (installed version may now work) 2013-09-07 11:03:57 -04:00
ad8d83289f add support in JACK backend for specifying number of input and output channels to use 2013-09-06 17:21:23 -04:00
0456788663 fix JACK backend setup so that we know about graph, port changes etc. 2013-09-06 13:06:44 -04:00
8216eac044 fix for unconditional use of #include <malloc.h> which doesn't work on OS X
alloca() is defined in stdlib on most *nix systems
2013-09-06 10:55:35 -04:00
79fed95c1b tighten up error handling a little bit during various setup functions for Mackie Control 2013-09-06 10:39:14 -04:00
018465f739 exit early from AsyncMIDIPort::drain() if it will never be used in a process callback again 2013-09-06 10:38:49 -04:00
1e7ca12f16 Use correct define when building ControlProtocol to export symbols 2013-09-06 14:32:01 +10:00
8ddd12a60d Rename SearchPath class Searchpath
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
2013-09-06 14:31:11 +10:00
e6c7ecf0e3 Ifdef some non-portable code for MinGW
jack_native_thread_t is HANDLE for MinGW builds of jack so using pthread API
cannot work.
2013-09-06 14:30:54 +10:00
87a440553f Fix for isnan using MinGW compiler 2013-09-06 14:30:45 +10:00
dadc9f63e7 Add test for writing a jack config file 2013-09-06 14:30:38 +10:00
ee00dce911 Remove windows specific quoting now that jack autostart works on windows
This allows jack2 to autostart using the .jackdrc we write
2013-09-06 14:30:30 +10:00
538a1e79c4 Remove ARDOUR::start_jack_server now that jack autostart works on windows 2013-09-06 14:30:19 +10:00
94efddd240 fix a problem creating and displaying connected status for ports not owned by ardour (e.g. system:....)
This was caused by using jack_port_get_connections() which will
not return the correct status for ports owned by another JACK
client. Because of the potential for deadlock by calling
jack_port_get_all_connections(), an extra argument was added
to several PortEngine:: API calls to specify whether the call
is in a process-callback context, which defaults to true.

The only place where false is passed is within the GlobalPortMatrix
when we need to determine whether two non-ardour ports are
connected.
2013-09-05 21:39:43 -04:00
1c49138e00 move MidiPortManager from AudioEngine to Session
This makes the responsibilities and ownership of non-Route related MIDI ports
more clear, and removes a few wierd bits of code. It also ensures that open/close/open
on the same session will retain connections for those MIDI ports
2013-09-05 13:22:34 -04:00
d9994c10b4 'libs/ardour' - Revert 'std::llabs' to 'llabs' until we find a platform-neutral solution (MOTE - 'llabs' and '::llabs' are being used successfully in other parts of Ardour) 2013-09-05 10:10:45 +01:00
a64f7fe28c 'libs/ardour' - Minor changes to prevent MSVC from complaining about malformed comments 2013-09-05 10:07:57 +01:00
f225eaa919 'surfaces/mackie' - Platform specific changes 2013-09-05 10:04:18 +01:00
447e986a0a 'surfaces/mackie' - Other minor changes needed for building with MSVC 2013-09-05 10:03:07 +01:00
a7ab40e8ae 'surfaces/mackie' - Comment out some structure field names which MSVC didn't like 2013-09-05 10:02:11 +01:00
7b5d72eabd 'surfaces/generic_midi' - Specify 'MIDI::byte' instead of 'byte' so the compiler knows which one we mean 2013-09-05 09:50:58 +01:00
5abea78d40 'surfaces/generic_midi' - Comment out some structure field names which MSVC didn't like 2013-09-05 09:49:10 +01:00
ee7cc091b3 'surfaces/generic_midi' - Minor modification to prevent MSVC from complaining about a malformed comment 2013-09-05 09:47:37 +01:00
6daeba047e 'libs/audiographer' - Try 'lrintf' instead of 'rintf' which isn't available in MSVC 2013-09-05 09:21:30 +01:00
e14966e778 'libs/audiographer' - Use 'alloca()' for a stack based array whose size is unknown (required to be buildable with MSVC) 2013-09-05 09:18:30 +01:00
35cc3245db rename interface_ stuff in the engine dialog to device_, since that feels a bit clearer terminology 2013-09-04 12:37:44 -04:00