ardour/livetrax
13
0
Fork 0
Code

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

Browse Source
This commit is contained in:
Paul Davis 2013-10-07 20:29:05 -04:00
parent c727d18b80
commit f1b2674d9b
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/ardour.h
View File

@ -60,7 +60,7 @@ namespace ARDOUR {
*/ */
bool init (bool with_vst, bool try_optimization, const char* localedir); bool init (bool with_vst, bool try_optimization, const char* localedir);
void init_post_engine (); void init_post_engine ();
int cleanup (); void cleanup ();
bool no_auto_connect (); bool no_auto_connect ();
void make_property_quarks (); void make_property_quarks ();

13
libs/ardour/globals.cc
View File

@ -354,9 +354,15 @@ ARDOUR::init_post_engine ()
ARDOUR::PluginManager::instance().refresh (); ARDOUR::PluginManager::instance().refresh ();
} }
int void
ARDOUR::cleanup () ARDOUR::cleanup ()
{ {
if (!libardour_initialized) {
return;
}
ARDOUR::AudioEngine::destroy ();
delete Library; delete Library;
lrdf_cleanup (); lrdf_cleanup ();
delete &ControlProtocolManager::instance(); delete &ControlProtocolManager::instance();
@ -368,7 +374,8 @@ ARDOUR::cleanup ()
vstfx_exit(); vstfx_exit();
#endif #endif
PBD::cleanup (); PBD::cleanup ();
return 0;
return;
} }
void void