diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-09 14:00:42 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-09 14:00:42 -0400 |
| commit | 2a6a16f980ff9181b138f7a30aedfbde4426a591 (patch) | |
| tree | d86752508bbd033be18301796e7d0c571a4fe1c0 /libs/ardour/globals.cc | |
| parent | 66aa6dfc8ecdb7591768bc45866a8c2b0d77e767 (diff) | |
| parent | 465b800d8b7dc0d9e0f92a16c6fcae29d2bbd544 (diff) | |
merge with master, fixing conflicts in 3 wscript files
Diffstat (limited to 'libs/ardour/globals.cc')
| -rw-r--r-- | libs/ardour/globals.cc | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 0cda9ebdf4..84693af541 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -366,9 +366,15 @@ ARDOUR::init_post_engine () ARDOUR::PluginManager::instance().refresh (); } -int -ARDOUR::cleanup () +void +ARDOUR::cleanup () { + if (!libardour_initialized) { + return; + } + + ARDOUR::AudioEngine::destroy (); + delete Library; #ifdef HAVE_LRDF lrdf_cleanup (); @@ -382,7 +388,8 @@ ARDOUR::cleanup () vstfx_exit(); #endif PBD::cleanup (); - return 0; + + return; } void @@ -544,7 +551,11 @@ ARDOUR::get_available_sync_options () { vector<SyncSource> ret; - ret.push_back (JACK); + boost::shared_ptr<AudioBackend> 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); |