projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
visualize port connections in mixer/processor when in < out
[ardour.git]
/
libs
/
ardour
/
globals.cc
diff --git
a/libs/ardour/globals.cc
b/libs/ardour/globals.cc
index aac7709f90da8c7c1dd610f552870d9e1ddc6c0a..9850d82d314b96b92d10fdab178db6d099410cd6 100644
(file)
--- a/
libs/ardour/globals.cc
+++ b/
libs/ardour/globals.cc
@@
-354,9
+354,15
@@
ARDOUR::init_post_engine ()
ARDOUR::PluginManager::instance().refresh ();
}
ARDOUR::PluginManager::instance().refresh ();
}
-int
-ARDOUR::cleanup ()
+void
+ARDOUR::cleanup ()
{
{
+ if (!libardour_initialized) {
+ return;
+ }
+
+ ARDOUR::AudioEngine::destroy ();
+
delete Library;
lrdf_cleanup ();
delete &ControlProtocolManager::instance();
delete Library;
lrdf_cleanup ();
delete &ControlProtocolManager::instance();
@@
-368,7
+374,8
@@
ARDOUR::cleanup ()
vstfx_exit();
#endif
PBD::cleanup ();
vstfx_exit();
#endif
PBD::cleanup ();
- return 0;
+
+ return;
}
void
}
void
@@
-530,7
+537,11
@@
ARDOUR::get_available_sync_options ()
{
vector<SyncSource> ret;
{
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);
ret.push_back (MTC);
ret.push_back (MIDIClock);
ret.push_back (LTC);