Ticket #8253: sky-intro-music.diff

scummvm/sky/intro.cpp

@@ -32 +32 @@
             _mixer->stopAll();
 #define CHECK_ESC if (_key_pressed == 27) { _skyScreen->stopSequence(); REMOVE_INTRO return false; }
 #define WAIT_SEQUENCE while (_skyScreen->sequenceRunning()) { checkCommands(commandPtr); delay(50); CHECK_ESC }
+#define WAIT_MUSIC while (_skyMusic->musicIsPlaying()) { delay(50); CHECK_ESC }
 
 #define INTRO_TEXT_WIDTH    128
 
@@ -349 +350 @@
                 commandPtr = (uint32 *)anim5Commands;
                 
                 WAIT_SEQUENCE;
+
+                // There is no synchronization mechanism between the music and
+                // the graphics. Which means that there is no guarantee that
+                // they both end at the same time. So just to be safe, wait
+                // for the music to stop before continuing with the final part.
+                //
+                // This part of the intro looks pretty nice even as a static
+                // image, so it makes sense to do the waiting before fading
+                // down the palette.
+
+                WAIT_MUSIC;
+                
                 _skyDisk->prefetchFile(FN_6_PAL);
                 _skyDisk->prefetchFile(FN_6_LOG);
                 _skyDisk->prefetchFile(FN_6A);

scummvm/sky/music/adlibchannel.cpp

@@ -61 +61 @@
         _musicVolume = 0x100;
 }
 
+bool SkyAdlibChannel::isActive(void) {
+
+        return _channelData.channelActive != 0;
+}
+
 void SkyAdlibChannel::updateVolume(uint16 pVolume) {
 
         _musicVolume = pVolume;

scummvm/sky/music/adlibchannel.h

@@ -64 +64 @@
         virtual void stopNote(void);
         virtual uint8 process(uint16 aktTime);
         virtual void updateVolume(uint16 pVolume);
+        virtual bool isActive(void);
 private:
         uint8 *_musicData;
         uint16 _musicVolume;

scummvm/sky/music/gmchannel.cpp

@@ -63 +63 @@
         _musicVolume = 0x100;
 }
 
+bool SkyGmChannel::isActive(void) {
+
+        return _channelData.channelActive != 0;
+}
+
 void SkyGmChannel::updateVolume(uint16 pVolume) {
 
         _musicVolume = pVolume;

scummvm/sky/music/gmchannel.h

@@ -42 +42 @@
         virtual void stopNote(void);
         virtual uint8 process(uint16 aktTime);
         virtual void updateVolume(uint16 pVolume);
+        virtual bool isActive(void);
 private:
         byte *_mt32_to_gm;
         static uint8 _veloTab[128];

scummvm/sky/music/musicbase.cpp

@@ -57 +57 @@
         _system->unlock_mutex(_mutex);
 }
 
+bool SkyMusicBase::musicIsPlaying(void)
+{
+        for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++)
+                if (_channels[cnt]->isActive())
+                        return true;
+        return false;
+}
+
 void SkyMusicBase::musicCommand(uint16 command)
 {
         if (_musicData == NULL) {

scummvm/sky/music/musicbase.h

@@ -38 +38 @@
         virtual void stopNote(void) = 0;
         virtual uint8 process(uint16 aktTime) = 0;
         virtual void updateVolume(uint16 pVolume) = 0;
+        virtual bool isActive(void) = 0;
 private:
 };
 
@@ -48 +49 @@
         void loadSection(uint8 pSection);
         void musicCommand(uint16 command);
         void startMusic(uint16 param) { _onNextPoll.musicToProcess = param & 0xF; }; // 4
+        bool musicIsPlaying(void);
         virtual void setVolume(uint8 volume) = 0;
         uint8 giveVolume(void) { return (uint8)_musicVolume; };
         uint8 giveCurrentMusic(void) { return _currentMusic; };