John Emmas
e466ce40ad
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
2013-10-14 19:31:22 +01:00
Paul Davis
7444ac128e
fix inability to export twice
2013-10-12 11:07:57 -04:00
Paul Davis
589ef168c1
adapt JACK audiobackend to pay attention to new _start() API related to latency measurement
2013-10-12 10:03:15 -04:00
John Emmas
fa71d82dda
Merge branch 'windows' into windows+cc
2013-10-11 18:23:53 +01:00
Paul Davis
cf3d8d15f0
some slightly hackish changes to make it possible to use the new internal ALSA midi client (soon to become a driver, however)
2013-10-10 16:54:46 -04:00
Paul Davis
c96108c2e1
add API to get current MIDI option from an audio/MIDI backend
2013-10-10 16:18:00 -04:00
Paul Davis
1bd04f8bf3
add JACK backend support for MIDI option discovery
2013-10-10 12:59:11 -04:00
Paul Davis
2a6a16f980
merge with master, fixing conflicts in 3 wscript files
2013-10-09 14:00:42 -04:00
Paul Davis
927ebe3b5f
reduce version requirement for JACK
2013-10-08 17:12:20 -04:00
Paul Davis
af8a1c146d
move JACK configuration test(s) down to where they belong (in libs/backend/jack)
2013-10-08 16:13:39 -04:00
Paul Davis
c98abed37f
restore jack timebase master and jack session callback functionality (moved into the JACK backend)
2013-10-08 14:02:03 -04:00
Paul Davis
7e077bdeba
-arestore jack timebase master and jack session callback functionality (moved into the JACK backend)
2013-10-08 14:01:43 -04:00
John Emmas
300b484cf6
Merge branch 'master' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
Tim Mayberry
f3a22fb880
Implement JACKAudioBackend::in_process_thread
2013-10-04 18:54:54 +10:00
Tim Mayberry
53ad2d187f
Move processing thread list from ARDOUR::Graph into AudioBackend implementation
2013-10-04 18:53:37 +10:00
Tim Mayberry
df363a4fb3
Add AudioBackendThread class to support different thread type on windows
2013-10-04 18:51:47 +10:00
Paul Davis
c736d88a5f
don't ping JACK server 4 times to see if it is already up when ardour starts
2013-09-25 22:56:28 -04:00
John Emmas
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
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
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
Paul Davis
fb45fdc052
fix conflicts and merge with master
2013-09-16 22:11:06 -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
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
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
b085a79938
explanatory comment
2013-09-13 10:19:01 -04:00
Paul Davis
c985a64d58
merge with master and fix Searchpath conflict
2013-09-12 11:40:56 -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
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
5ec69e2374
move inadvertently moved jack_slave.cc back to its rightful spot
2013-09-07 13:39:36 -04:00
Paul Davis
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
