Paul Davis
2ba2a50dec
Merge branch 'master' into windows
2013-12-04 11:50:36 -05:00
Paul Davis
ce7bfb489c
change "cpu" in cpu load backend functions
2013-12-04 11:48:31 -05:00
Paul Davis
0258f2958b
switch from using Sleep/usleep to Glib::usleep()
2013-12-03 10:24:05 -05:00
Tim Mayberry
a420328354
Reinstate call to package config for JACK backend
...
Not sure how this got lost, merge perhaps.
2013-12-03 20:28:17 +10:00
Tim Mayberry
0f6a65e405
Use Sleep instead of usleep on windows in JACK backend
2013-12-03 20:28:10 +10:00
Tim Mayberry
f74521b0cd
Remove command line string quoting when forming jack command line on windows
...
This used to be necessary when we started the JACK server but now that we
write a .jackdrc it only causes problems.
I have fixed this before in some branch, must have been lost in a merge.
2013-12-02 21:28:19 +10:00
Tim Mayberry
a9fc076d2e
Waf options are not valid during build stage so use environment variable
2013-12-02 21:26:28 +10:00
Tim Mayberry
18a59dd7fa
Include pbd/localtime_r.h in session_jack.cc for MinGW
2013-12-02 21:22:14 +10:00
Paul Davis
15cee60021
merge and resolve conflict with master
2013-11-29 22:29:25 -05:00
Paul Davis
1190f1d0e0
make JACK backend return the right set of values when asked for buffer sizes or sample rate of a device other than the one in use
2013-11-27 17:41:54 -05:00
Paul Davis
d63e8ba0e8
Merge branch 'master' into windows
2013-11-27 16:18:22 -05:00
Paul Davis
611d93830a
add 0.5 second sleep after closing JACK connection so that next startup/connect is likely to work (allowing JACK time to shutdown). Ugh
2013-11-27 15:25:10 -05:00
Paul Davis
56716a1f28
add error check to call to PortManager::reestablish_ports
2013-11-27 15:24:24 -05:00
Paul Davis
dc4a984cd6
move AudioBackend::_start() into protected, and expand a bit on documenting ::start() vs ::_start()
2013-11-27 14:27:27 -05:00
Paul Davis
08371ae2cf
resolve merge with master (?)
2013-11-26 10:24:51 -05:00
Paul Davis
7fec991077
fix thinko in declaration of ARDOUR::PortEngine::get_port_by_name()
2013-10-28 09:46:59 -04:00
Colin Fletcher
a18db90264
Report an error to stderr if creation of jack command line fails.
...
Output a simple message to stderr if get_jack_command_line_string() still
fails for any reason.
2013-10-23 19:32:54 +01: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
Paul Davis
d135c4dc3a
fix merge conflicts with master
2013-10-23 08:47:57 -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
Paul Davis
fb313fb174
Merge branch 'master' into windows
2013-10-16 21:57:17 -04: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
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
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
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
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
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
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
