Ticket #1706: simon_midi.diff

simon/midi.cpp

@@ -283 +283 @@
 
 void MidiPlayer::setLoop (bool loop) {
         _system->lockMutex(_mutex);
-        _loopTrack = loop;
+        setLoopInternal(loop);
         _system->unlockMutex(_mutex);
 }
 
+void MidiPlayer::setLoopInternal (bool loop) {
+        _loopTrack = loop;
+}
+
 void MidiPlayer::queueTrack (int track, bool loop) {
         _system->lockMutex(_mutex);
         if (_currentTrack == 255) {
                 _system->unlockMutex(_mutex);
-                setLoop(loop);
+                setLoopInternal(loop);
                 startTrack(track);
         } else {
                 _queuedTrack = track;
@@ -399 +403 @@
                 // 1 BYTE : Ranges from 0x02 to 0x08 (always 0x02 for SFX, though)
                 // 1 BYTE : Loop control. 0 = no loop, 1 = loop
                 if (!sfx)
-                        setLoop(p->data[6] != 0);
+                        setLoopInternal(p->data[6] != 0);
 
         }
 

simon/midi.h

@@ -75 +75 @@
         void clearConstructs();
         void clearConstructs (MusicInfo &info);
         void resetVolumeTable();
+        void setLoopInternal (bool loop);
 
 public:
         bool _enable_sfx;