ardour/livetrax
13
0
Fork 0
Code

Make ARDOUR::init safer.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5950 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-10-27 18:00:45 +00:00
parent da85f65ec0
commit c71f419920
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/main.cc
View File

@ -312,7 +312,9 @@ int main (int argc, char *argv[])
fixup_bundle_environment (); fixup_bundle_environment ();
#endif #endif
if (!Glib::thread_supported())
Glib::thread_init(); Glib::thread_init();
gtk_set_locale (); gtk_set_locale ();
#ifdef VST_SUPPORT #ifdef VST_SUPPORT

5
libs/ardour/globals.cc
View File

@ -308,6 +308,11 @@ lotsa_files_please ()
int int
ARDOUR::init (bool use_vst, bool try_optimization) ARDOUR::init (bool use_vst, bool try_optimization)
{ {
if (!Glib::thread_supported())
Glib::thread_init();
PBD::ID::init ();
extern void setup_enum_writer (); extern void setup_enum_writer ();
(void) bindtextdomain(PACKAGE, LOCALEDIR); (void) bindtextdomain(PACKAGE, LOCALEDIR);

2
libs/ardour/test/testrunner.cpp
View File

@ -9,8 +9,6 @@
int int
main() main()
{ {
Glib::thread_init ();
PBD::ID::init ();
ARDOUR::init (false, false); ARDOUR::init (false, false);
CppUnit::TestResult testresult; CppUnit::TestResult testresult;

1
libs/pbd/id.cc
View File

@ -38,6 +38,7 @@ uint64_t ID::_counter = 0;
void void
ID::init () ID::init ()
{ {
if (!counter_lock)
counter_lock = new Glib::Mutex; counter_lock = new Glib::Mutex;
} }