summaryrefslogtreecommitdiff
path: root/libs/ardour/globals.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-10-07 20:29:05 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-10-07 20:29:05 -0400
commitf1b2674d9b768ed20a5f8aae7e59962c5ed514a4 (patch)
treef4881cdabd90c9b51965b3224830fa0908d81c5d /libs/ardour/globals.cc
parentc727d18b800189f571eb994e6597ef6566a70200 (diff)
change return type on ARDOUR::cleanup() since nobody cares what it returns
Diffstat (limited to 'libs/ardour/globals.cc')
-rw-r--r--libs/ardour/globals.cc13
1 files changed, 10 insertions, 3 deletions
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