Ticket #1643: dimuse-idea.diff

scumm/imuse_digi/dimuse.h

@@ -159 +159 @@
         void refreshScripts();
         void flushTracks();
         int getSoundStatus(int sound) const;
+        bool isSoundInUse(int sound) const;
         int32 getCurMusicPosInMs();
         int32 getCurVoiceLipSyncWidth();
         int32 getCurVoiceLipSyncHeight();

scumm/imuse_digi/dimuse_script.cpp

@@ -274 +274 @@
         return 0;
 }
 
+bool IMuseDigital::isSoundInUse(int sound) const {
+        Common::StackLock lock(_mutex, "IMuseDigital::isSoundInUse()");
+
+        for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
+                Track *track = _track[l];
+                if (track->soundId == sound)
+                        return true;
+        }
+        return false;
+}
+
 void IMuseDigital::stopSound(int soundId) {
         debug(5, "IMuseDigital::stopSound(%d)", soundId);
         for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {

scumm/imuse_digi/dimuse_sndmgr.cpp

@@ -302 +302 @@
                 _sounds[slot].name[0] = 0;
                 if ((soundType == IMUSE_RESOURCE)) {
                         _vm->ensureResourceLoaded(rtSound, soundId);
-                        _vm->lock(rtSound, soundId);
                         ptr = _vm->getResourceAddress(rtSound, soundId);
                         if (ptr == NULL) {
                                 closeSound(&_sounds[slot]);
@@ -371 +370 @@
 void ImuseDigiSndMgr::closeSound(soundStruct *soundHandle) {
         assert(soundHandle && checkForProperHandle(soundHandle));
 
-        if (soundHandle->resPtr)
-                _vm->unlock(rtSound, soundHandle->soundId);
-
         delete soundHandle->bundle;
         for (int r = 0; r < soundHandle->numSyncs; r++)
                 free(soundHandle->sync[r].ptr);

scumm/sound.cpp

@@ -679 +679 @@
  * are being faded out: get_sound_active() returns true even when the
  * sound is being faded out, while getSoundStatus() returns false in
  * that case.
+ * In addition, it calls isSoundInUse() instead of getSoundStatus() in
+ * IMuseDigital. The difference between these two is that the isSoundInUse()
+ * doesn't require that the mixer is playing the sound at the moment.
  */
 bool Sound::isSoundInUse(int sound) const {
 
         if (_vm->_imuseDigital)
-                return (_vm->_imuseDigital->getSoundStatus(sound) != 0);
+                return _vm->_imuseDigital->isSoundInUse(sound);
 
         if (sound == _currentCDSound)
                 return pollCD() != 0;