Make ARDOUR::init safer.

git-svn-id: svn://localhost/ardour2/branches/3.0@5950 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/main.cc

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

libs/ardour/globals.cc

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

libs/ardour/test/testrunner.cpp

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

libs/pbd/id.cc

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