From 960a47330a5d3e534e6275f42efc07585a2075e1 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 19 Sep 2013 17:34:23 -0400 Subject: switch from JACK_Slave to Engine_Slave --- libs/ardour/globals.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libs/ardour/globals.cc') diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index aac7709f90..459f6f0e51 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -530,7 +530,11 @@ ARDOUR::get_available_sync_options () { vector ret; - ret.push_back (JACK); + boost::shared_ptr backend = AudioEngine::instance()->current_backend(); + if (backend && backend->name() == "JACK") { + ret.push_back (Engine); + } + ret.push_back (MTC); ret.push_back (MIDIClock); ret.push_back (LTC); -- cgit v1.2.3 From f1b2674d9b768ed20a5f8aae7e59962c5ed514a4 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 7 Oct 2013 20:29:05 -0400 Subject: change return type on ARDOUR::cleanup() since nobody cares what it returns --- libs/ardour/ardour/ardour.h | 2 +- libs/ardour/globals.cc | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'libs/ardour/globals.cc') diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 311611997f..80bdf9d80e 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -60,7 +60,7 @@ namespace ARDOUR { */ bool init (bool with_vst, bool try_optimization, const char* localedir); void init_post_engine (); - int cleanup (); + void cleanup (); bool no_auto_connect (); void make_property_quarks (); diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 459f6f0e51..9850d82d31 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -354,9 +354,15 @@ ARDOUR::init_post_engine () ARDOUR::PluginManager::instance().refresh (); } -int -ARDOUR::cleanup () +void +ARDOUR::cleanup () { + if (!libardour_initialized) { + return; + } + + ARDOUR::AudioEngine::destroy (); + delete Library; lrdf_cleanup (); delete &ControlProtocolManager::instance(); @@ -368,7 +374,8 @@ ARDOUR::cleanup () vstfx_exit(); #endif PBD::cleanup (); - return 0; + + return; } void -- cgit v1.2.3