Paul Davis
3020b224fa
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
2014-01-10 16:07:57 -05:00
Colin Fletcher
70f0cfdb3b
Don't ever pass -d for device name to dummy jackd driver
2013-10-23 19:32:54 +01:00
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
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
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
589ef168c1
adapt JACK audiobackend to pay attention to new _start() API related to latency measurement
2013-10-12 10:03:15 -04: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
1bd04f8bf3
add JACK backend support for MIDI option discovery
2013-10-10 12:59:11 -04:00
Paul Davis
c985a64d58
merge with master and fix Searchpath conflict
2013-09-12 11:40:56 -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
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