Ticket #1953: sky.diff

sky/control.cpp

@@ -1573 +1573 @@
         _skyScreen->halvePalette();
         _skyScreen->showScreen(screenData);
         free(textBuf1); free(textBuf2);
+        // __tom (FIXME): This is a poor method of turning
+        // off music. ~GmMusic, ~AdlibMusic, and ~MT32Music
+        // should do it themselves so the appropriate MIDI
+        // controller events (e.g. 123/'All Notes Off') can
+        // be sent. However, that requires a re-write of
+        // other code and for now this fixes hanging notes
+        // on MT-32 + other external GMIDI synths.
+        _skyMusic->stopMusic();
         delay(1500);
         ConfMan.flushToDisk();
         _system->quit();

sky/music/musicbase.h

@@ -53 +53 @@
         void loadSection(uint8 pSection);
         void musicCommand(uint16 command);
         void startMusic(uint16 param) { _onNextPoll.musicToProcess = param & 0xF; }; // 4
+        void stopMusic();                                                            // 7
         bool musicIsPlaying(void);
         virtual void setVolume(uint8 volume) = 0;
         uint8 giveVolume(void) { return (uint8)_musicVolume; };
@@ -87 +88 @@
         void setTempo(uint16 newTempo);                                              // 2
         void pollMusic();                                                            // 3
         void reinitFM(void) { _onNextPoll.doReInit = true; };                        // 6
-        void stopMusic();                                                            // 7
         void setFMVolume(uint16 param);                                              // 13
 };