Fix race condition with jportaudio on Windows.

16 years ago · 064b2418f9
parent 9e8e04b176
commit 064b2418f9
3 changed files with 1 additions and 10 deletions
--- a/lib/native/windows-64/jportaudio.dll
+++ b/lib/native/windows-64/jportaudio.dll
--- a/lib/native/windows/jportaudio.dll
+++ b/lib/native/windows/jportaudio.dll
--- a/src/native/portaudio/AudioQualityImprovement.c
+++ b/src/native/portaudio/AudioQualityImprovement.c
@ -38,8 +38,7 @@ static void AudioQualityImprovement_updatePreprocess
 static pthread_mutex_t AudioQualityImprovement_sharedInstancesMutex
    = PTHREAD_MUTEX_INITIALIZER;
 #else /* Windows */
-static CRITICAL_SECTION AudioQualityImprovement_sharedInstancesMutex = {0};
-static int initialized = 0;
+static CRITICAL_SECTION AudioQualityImprovement_sharedInstancesMutex = {(void*)-1, -1, 0, 0, 0, 0};
 #endif

 static AudioQualityImprovement *AudioQualityImprovement_sharedInstances
@ -104,14 +103,6 @@ AudioQualityImprovement_getSharedInstance(const char *stringID, jlong longID)
 {
    AudioQualityImprovement *theSharedInstance = NULL;

-#ifdef _WIN32
-    if(!initialized)
-    {
-        mutex_init(&AudioQualityImprovement_sharedInstancesMutex, NULL);
-        initialized = 1;
-    }
-#endif
-
    if (!mutex_lock(&AudioQualityImprovement_sharedInstancesMutex))
    {
        AudioQualityImprovement *aSharedInstance