Paul Davis 15cee60021 merge and resolve conflict with master

2013-11-29 22:29:25 -05:00

..

jack_api.cc

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

jack_audiobackend.cc

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

jack_audiobackend.h

move AudioBackend::_start() into protected, and expand a bit on documenting ::start() vs ::_start()

2013-11-27 14:27:27 -05:00

jack_connection.cc

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

jack_connection.h

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

jack_portengine.cc

fix thinko in declaration of ARDOUR::PortEngine::get_port_by_name()

2013-10-28 09:46:59 -04:00

jack_session.cc

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

jack_session.h

-arestore jack timebase master and jack session callback functionality (moved into the JACK backend)

2013-10-08 14:01:43 -04:00

jack_utils.cc

resolve merge with master (?)

2013-11-26 10:24:51 -05:00

jack_utils.h

adapt JACK audiobackend to pay attention to new _start() API related to latency measurement

2013-10-12 10:03:15 -04:00

wscript

merge with master, fixing conflicts in 3 wscript files

2013-10-09 14:00:42 -04:00