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

..

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

fix inability to export twice

2013-10-12 11:07:57 -04:00

jack_audiobackend.h

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

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

jack_connection.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_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

update JACK backend to use new inheritance structure for AudioBackend

2013-09-13 11:21:43 -04:00

jack_session.cc

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

2013-10-08 14:01:43 -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

Merge branch 'master' into windows+cc

2013-10-14 19:31:22 +01: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 branch 'windows' into windows+cc

2013-10-11 18:23:53 +01:00