diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-07 20:29:05 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-07 20:29:05 -0400 |
commit | f1b2674d9b768ed20a5f8aae7e59962c5ed514a4 (patch) | |
tree | f4881cdabd90c9b51965b3224830fa0908d81c5d /libs | |
parent | c727d18b800189f571eb994e6597ef6566a70200 (diff) |
change return type on ARDOUR::cleanup() since nobody cares what it returns
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/ardour.h | 2 | ||||
-rw-r--r-- | libs/ardour/globals.cc | 13 |
2 files changed, 11 insertions, 4 deletions
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 |