Use a mutex to make jack_client_open/jack_client_close thread safe, remove use of jack_init/jack_uninit.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2968 0c269be4-1314-0410-8aa9-9f06e86f4224

1 files changed, 4 insertions, 79 deletions

diff --git a/common/JackGlobals.cpp b/common/JackGlobals.cpp
index ca870d07..2888da64 100644
--- a/common/JackGlobals.cpp
+++ b/common/JackGlobals.cpp
@@ -19,85 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "JackGlobals.h"
 
-static bool gKeyRealtimeInitialized = false;
-static bool g_key_log_function_initialized = false;
-
 jack_tls_key gRealTime;
-jack_tls_key g_key_log_function;
-
-// Initialisation at library load time
-#ifdef WIN32
-
-static void jack_init()
-{
-    if (!gKeyRealtimeInitialized) {
-        gKeyRealtimeInitialized = jack_tls_allocate_key(&gRealTime);
-    }
-    
-    if (!g_key_log_function_initialized)
-        g_key_log_function_initialized = jack_tls_allocate_key(&g_key_log_function);
-}
-
-static void jack_uninit()
-{
-    if (gKeyRealtimeInitialized) {
-        jack_tls_free_key(gRealTime);
-        gKeyRealtimeInitialized = false;
-    }
-    
-    if (g_key_log_function_initialized) {
-        jack_tls_free_key(g_key_log_function);
-        g_key_log_function_initialized = false;
-    }
-}
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+static bool gKeyRealtimeInitialized = jack_tls_allocate_key(&gRealTime);
 
-BOOL WINAPI DllEntryPoint(HINSTANCE  hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    switch (fdwReason) {
-        case DLL_PROCESS_ATTACH:
-            jack_init();
-            break;
-        case DLL_PROCESS_DETACH:
-            jack_uninit();
-            break;
-    }
-    return TRUE;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#else
-
-__attribute__ ((constructor))
-static void jack_init()
-{
-    if (!gKeyRealtimeInitialized) {
-        gKeyRealtimeInitialized = jack_tls_allocate_key(&gRealTime);
-    }
-    
-    if (!g_key_log_function_initialized)
-        g_key_log_function_initialized = jack_tls_allocate_key(&g_key_log_function);
-}
-
-__attribute__ ((destructor))
-static void jack_uninit()
-{
-    if (gKeyRealtimeInitialized) {
-        jack_tls_free_key(gRealTime);
-        gKeyRealtimeInitialized = false;
-    }
-    
-    if (g_key_log_function_initialized) {
-        jack_tls_free_key(g_key_log_function);
-        g_key_log_function_initialized = false;
-    }
-}
+jack_tls_key g_key_log_function;
+static bool g_key_log_function_initialized = jack_tls_allocate_key(&g_key_log_function);
 
-#endif
+JackMutex* gOpenMutex = new JackMutex();