Ticket #3323: audiocdsave.diff

engines/scumm/sound.cpp

@@ -37 +37 @@
 #include "common/util.h"
 
 #include "sound/adpcm.h"
-#include "sound/audiocd.h"
 #include "sound/flac.h"
 #include "sound/mididrv.h"
 #include "sound/mixer.h"

engines/scumm/scumm.h

@@ -38 +38 @@
 #include "scumm/detection.h"
 #include "scumm/script.h"
 
+#include "sound/audiocd.h"
 #include "sound/mididrv.h"
 
 namespace GUI {
@@ -608 +609 @@
         uint32 _lastSaveTime;
         bool _saveTemporaryState;
         char _saveLoadName[32];
+        Audio::AudioCDManager::Status _audioCDStatus;
 
         bool saveState(int slot, bool compat);
         bool loadState(int slot, bool compat);

engines/scumm/saveload.cpp

@@ -43 +43 @@
 #include "scumm/he/sprite_he.h"
 #include "scumm/verbs.h"
 
-#include "sound/audiocd.h"
 #include "sound/mixer.h"
 
 namespace Scumm {
@@ -376 +375 @@
 
         _sound->pauseSounds(false);
 
+        // If we are loading, and the music being loaded was supposed to loop
+        // forever, then resume playing it. This helps a lot when the audio CD
+        // is used to provide ambient music (see bug #788195).
+        if (_audioCDStatus.playing && _audioCDStatus.numLoops < 0) {
+                AudioCD.play(_audioCDStatus.track, _audioCDStatus.numLoops, _audioCDStatus.start, _audioCDStatus.duration);
+        }
+
         return true;
 }
 
@@ -1131 +1137 @@
         // Save/load the Audio CD status
         //
         if (s->getVersion() >= VER(24)) {
-                Audio::AudioCDManager::Status info;
                 if (s->isSaving())
-                        info = AudioCD.getStatus();
-                s->saveLoadArrayOf(&info, 1, sizeof(info), audioCDEntries);
-                // If we are loading, and the music being loaded was supposed to loop
-                // forever, then resume playing it. This helps a lot when the audio CD
-                // is used to provide ambient music (see bug #788195).
-                if (s->isLoading() && info.playing && info.numLoops < 0)
-                        AudioCD.play(info.track, info.numLoops, info.start, info.duration);
+                        _audioCDStatus = AudioCD.getStatus();
+                s->saveLoadArrayOf(&_audioCDStatus, 1, sizeof(_audioCDStatus), audioCDEntries);
+                // We may want to resume CD playing, but we can't do this until
+                // all sounds have been unpaused (see bug #1756381).
         }