change return type on ARDOUR::cleanup() since nobody cares what it returns

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 311611997f3466fa107f9c59353045e4e5a550a9..80bdf9d80e5c008babba931a1288e1890b239946 100644 (file)
--- 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 459f6f0e518c179a2003808ba380e4a866d34165..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 ();
 }
 
-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