Ticket #9037: scummvm-sci-musicfix.patch

core.cpp

@@ -37 +37 @@
 
 #include "common/system.h"
 #include "common/timer.h"
+#include "common/mutex.h"
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
@@ -551 +552 @@
                                     ** songs which are no longer
                                     ** active.  */
 
+        // We need to be left alone in here :)
+        Common::StackLock lock(_mutex);
+
         /*      _dump_playing_list(this, "before");*/
         freezeTime(); /* Store song delay time */
 

core.h

@@ -188 +188 @@
         uint16 _audioRate;
         Audio::SoundHandle _audioHandle;
         Audio::AudioStream* getAudioStream(uint32 number, uint32 volume, int *sampleLen);
+        Common::Mutex _mutex;
 };
 
 } // End of namespace Sci