Colin Fletcher
903d728b9c
Fix setting playback & capture channel counts for jackd dummy backend.
...
Unlike all the other jack backends which allow setting the number of inputs and
outputs with -i & -o, the dummy backend uses -P & -C for this. Make the jackd
command line use these options when the dummy backend is requested with a
specified input or output channel count.
2013-10-23 19:29:57 +01:00
Colin Fletcher
ac81ea642e
Don't fail jackd command line creation for jack dummy backend.
...
The dummy jackd backend doesn't require a device to be specified, so much
of the error checking in get_jack_command_line_string() is irrelevant, if
not actively wrong, when the dummy backend is specified.
Only perform the checks if the chosen jack backend is not the dummy.
2013-10-23 19:27:09 +01:00
Paul Davis
d135c4dc3a
fix merge conflicts with master
2013-10-23 08:47:57 -04:00
Paul Davis
664e715a00
merge from master
2013-10-22 15:29:44 -04:00
Paul Davis
cfe42bc4ea
fix issues with recording while synced to JACK (non-pure-virtual method added to AudioBackend) and remove pause() from AudioEngine/AudioBackend APIs
2013-10-21 16:24:24 -04:00
John Emmas
b855e5f322
Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/wscript
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/debug.h
libs/ardour/ardour/directory_names.h
libs/ardour/ardour/filesystem_paths.h
libs/ardour/ardour/session_event.h
libs/gtkmm2ext/gtkmm2ext/utils.h
libs/panners/1in2out/wscript
libs/panners/2in2out/wscript
libs/panners/vbap/wscript
libs/pbd/pbd/debug.h
libs/pbd/pbd/file_utils.h
libs/pbd/pbd/pathexpand.h
libs/pbd/pbd/ringbuffer.h
libs/pbd/pbd/ringbufferNPT.h
libs/pbd/pbd/search_path.h
libs/pbd/pbd/stacktrace.h
libs/pbd/pbd/uuid.h
libs/pbd/pbd/uuid_boost.h
libs/surfaces/control_protocol/control_protocol/basic_ui.h
libs/surfaces/control_protocol/control_protocol/control_protocol.h
2013-10-18 10:03:22 +01:00
Paul Davis
61c1956ef9
add -fvisibility=hidden to evoral, and make things work
2013-10-17 15:02:20 -04:00
Paul Davis
e5888d3983
merge with master and fix 2 conflicts
2013-10-16 22:06:56 -04:00
Paul Davis
fb313fb174
Merge branch 'master' into windows
2013-10-16 21:57:17 -04:00
John Emmas
75b933eadb
Merge remote-tracking branch 'remotes/origin/master' into windows+cc
2013-10-16 15:55:59 +01:00
Paul Davis
9a630003ff
fix up issues with MIDI I/O option when using jack1 or jack2's most recent options for this
2013-10-15 15:22:25 -04:00
Paul Davis
69a8fc43e2
Merge branch 'master' into windows
2013-10-15 11:17:12 -04:00
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
