Engine: Fixed MIDI awkwardness

Previously, MIDIs would retain some behavior from the previously playing MIDI, either because the Sequencer hadn't been reset or because a critical MidiMessage was incorrectly positioned. Both of these possibilities have been fixed.

2 files changed, 16 insertions, 2 deletions

@@ -62,6 +62,10 @@ public class Audio {
         if ((seq.getSequence() != null) && (seq.getSequence().equals(s)))
         {
             return;
+        } else {
+            seq.close();
+            
+            init();
         }
         
         try {
@@ -55,7 +55,12 @@ public class MidiParser {
         {
             parseShortMessage((ShortMessage) mm,tick);
         } else {
-            currentTrack.add(new MidiEvent(mm, tick));
+            if (foundFirstReal)
+            {
+                currentTrack.add(new MidiEvent(mm, tick-firstReal));
+            } else {
+                currentTrack.add(new MidiEvent(mm, 0));
+            }
         }
     }
     
@@ -77,7 +82,12 @@ public class MidiParser {
             }   
         }
         
-        currentTrack.add(new MidiEvent(mm, tick-firstReal));
+        if (foundFirstReal)
+        {
+            currentTrack.add(new MidiEvent(mm, tick-firstReal));
+        } else {
+            currentTrack.add(new MidiEvent(mm, 0));
+        }
     }
 
 }