13
0

Call PBD::init in ARDOUR::init and PBD::cleanup in ARDOUR::cleanup

This commit is contained in:
Tim Mayberry 2013-08-09 22:11:44 +10:00
parent 29193c76cc
commit 55c6d4f2be

View File

@ -60,6 +60,7 @@
#include "pbd/cpus.h" #include "pbd/cpus.h"
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/id.h" #include "pbd/id.h"
#include "pbd/pbd.h"
#include "pbd/strsplit.h" #include "pbd/strsplit.h"
#include "pbd/fpu.h" #include "pbd/fpu.h"
#include "pbd/file_utils.h" #include "pbd/file_utils.h"
@ -224,9 +225,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
return true; return true;
} }
if (!Glib::thread_supported()) { if (!PBD::init()) return false;
Glib::thread_init();
}
// this really should be in PBD::init..if there was one // this really should be in PBD::init..if there was one
Gio::init (); Gio::init ();
@ -235,7 +234,6 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
(void) bindtextdomain(PACKAGE, localedir); (void) bindtextdomain(PACKAGE, localedir);
#endif #endif
PBD::ID::init ();
SessionEvent::init_event_pool (); SessionEvent::init_event_pool ();
SessionObject::make_property_quarks (); SessionObject::make_property_quarks ();
@ -373,7 +371,7 @@ ARDOUR::cleanup ()
#ifdef LXVST_SUPPORT #ifdef LXVST_SUPPORT
vstfx_exit(); vstfx_exit();
#endif #endif
EnumWriter::destroy (); PBD::cleanup ();
return 0; return 0;
} }