spessasynth_core 4.0.13 → 4.0.15

package/dist/index.js

@@ -3280,11 +3280,17 @@ var BasicMIDI2 = class _BasicMIDI {
             // Cc change: loop points
             case midiMessageTypes.controllerChange:
               switch (e.data[0]) {
+                // Touhou
                 case 2:
+                // RPG Maker
+                case 111:
+                // EMIDI/XMI
                 case 116:
                   loopStart = e.ticks;
                   break;
+                // Touhou
                 case 4:
+                // EMIDI/XMI
                 case 117:
                   if (loopEnd === null) {
                     loopEnd = e.ticks;
@@ -3425,14 +3431,9 @@ var BasicMIDI2 = class _BasicMIDI {
       consoleColors.recognized,
       consoleColors.info
     );
-    if (loopStart !== null && loopEnd === null) {
-      loopStart = this.firstNoteOn;
+    loopStart ??= this.firstNoteOn;
+    if (loopEnd === null || loopEnd === 0) {
       loopEnd = this.lastVoiceEventTick;
-    } else {
-      loopStart ??= this.firstNoteOn;
-      if (loopEnd === null || loopEnd === 0) {
-        loopEnd = this.lastVoiceEventTick;
-      }
     }
     this.loop = { start: loopStart, end: loopEnd };
     SpessaSynthInfo(
@@ -3532,9 +3533,6 @@ var BasicMIDI2 = class _BasicMIDI {
       );
     }
     this.duration = this.midiTicksToSeconds(this.lastVoiceEventTick);
-    if (this.duration === 0) {
-      throw new Error("The MIDI file no duration.");
-    }
     if (this.binaryName && this.binaryName.length < 1) {
       this.binaryName = void 0;
     }
@@ -3909,7 +3907,8 @@ function processTick() {
       this.setTimeTicks(this._midiData.loop.start);
       return;
     }
-    if (nextTrack.events.length <= this.eventIndexes[nextTrackIndex]) {
+    if (nextTrack.events.length <= this.eventIndexes[nextTrackIndex] || // https://github.com/spessasus/spessasynth_core/issues/21
+    event.ticks >= this._midiData.lastVoiceEventTick) {
       this.songIsFinished();
       return;
     }
@@ -3940,6 +3939,11 @@ function loadNewSequenceInternal(parsedMidi) {
   if (!parsedMidi.tracks) {
     throw new Error("This MIDI has no tracks!");
   }
+  if (parsedMidi.duration === 0) {
+    SpessaSynthWarn("This MIDI file has a duration of exactly 0 seconds.");
+    this.pausedTime = 0;
+    return;
+  }
   this.oneTickToSeconds = 60 / (120 * parsedMidi.timeDivision);
   this._midiData = parsedMidi;
   this.synth.clearEmbeddedBank();
@@ -5099,9 +5103,9 @@ var SpessaSynthSequencer = class {
    * @param value the playback rate to set.
    */
   set playbackRate(value) {
-    const time = this.currentTime;
+    const t = this.currentTime;
     this._playbackRate = value;
-    this.currentTime = time;
+    this.recalculateStartTime(t);
   }
   /**
    * The current time of the sequencer.
@@ -5137,11 +5141,6 @@ var SpessaSynthSequencer = class {
     } else {
       this.playingNotes = [];
       this.callEvent("timeChange", { newTime: time });
-      if (this._midiData.duration === 0) {
-        SpessaSynthWarn("No duration!");
-        this.callEvent("pause", { isFinished: true });
-        return;
-      }
       this.setTimeTo(time);
       this.recalculateStartTime(time);
     }
@@ -5158,7 +5157,10 @@ var SpessaSynthSequencer = class {
    */
   play() {
     if (!this._midiData) {
-      throw new Error("No songs loaded in the sequencer!");
+      SpessaSynthWarn(
+        "No songs loaded in the sequencer. Ignoring the play call."
+      );
+      return;
     }
     if (this.currentTime >= this._midiData.duration) {
       this.currentTime = 0;