Ticket #3525: 1854550.diff

imuse_digi/dimuse_track.cpp

@@ -71 +71 @@
 }
 
 void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, int volGroupId, Audio::AudioStream *input, int hookId, int volume, int priority) {
+        Common::StackLock lock(_mutex, "IMuseDigital::startSound()");
         debug(5, "IMuseDigital::startSound(%d)", soundId);
 
         int l = allocSlot(priority);
@@ -81 +82 @@
 
         Track *track = _track[l];
         while (1) {
-                _mutex.lock();
                 if (!track->used) {
                         break;
                 }
@@ -94 +94 @@
 #ifndef __PLAYSTATION2__
                 _vm->parseEvents();
 #endif
+                _mutex.lock();
         }
 
         track->pan = 64;
@@ -191 +192 @@
         }
 
         track->used = true;
-        _mutex.unlock();
 }
 
 void IMuseDigital::setPriority(int soundId, int priority) {