spessasynth_core 4.0.20 → 4.0.22

package/dist/index.js

@@ -2873,7 +2873,7 @@ var BasicMIDI2 = class _BasicMIDI {
   /**
    * The loop points (in ticks) of the sequence, including both start and end points.
    */
-  loop = { start: 0, end: 0 };
+  loop = { start: 0, end: 0, type: "hard" };
   /**
    * The file name of the MIDI sequence, if provided during parsing.
    */
@@ -3257,7 +3257,7 @@ var BasicMIDI2 = class _BasicMIDI {
     this.keyRange = { max: 0, min: 127 };
     this.lastVoiceEventTick = 0;
     this.portChannelOffsetMap = [0];
-    this.loop = { start: 0, end: 0 };
+    this.loop = { start: 0, end: 0, type: "hard" };
     this.isKaraokeFile = false;
     this.isMultiPort = false;
     let nameDetected = false;
@@ -3266,6 +3266,7 @@ var BasicMIDI2 = class _BasicMIDI {
     }
     let loopStart = null;
     let loopEnd = null;
+    let loopType = "hard";
     for (const track of this.tracks) {
       const usedChannels = /* @__PURE__ */ new Set();
       let trackHasVoiceMessages = false;
@@ -3293,6 +3294,7 @@ var BasicMIDI2 = class _BasicMIDI {
                 // EMIDI/XMI
                 case 117:
                   if (loopEnd === null) {
+                    loopType = "soft";
                     loopEnd = e.ticks;
                   } else {
                     loopEnd = 0;
@@ -3435,7 +3437,7 @@ var BasicMIDI2 = class _BasicMIDI {
     if (loopEnd === null || loopEnd === 0) {
       loopEnd = this.lastVoiceEventTick;
     }
-    this.loop = { start: loopStart, end: loopEnd };
+    this.loop = { start: loopStart, end: loopEnd, type: loopType };
     SpessaSynthInfo(
       `%cLoop points: start: %c${this.loop.start}%c end: %c${this.loop.end}`,
       consoleColors.info,
@@ -3629,13 +3631,7 @@ var MIDIBuilder = class extends BasicMIDI2 {
         `Track ${track} does not exist. Add it via addTrack method.`
       );
     }
-    if (event < midiMessageTypes.noteOff) {
-      if (track > 0) {
-        throw new Error(
-          `Meta events must be added to the first track, not track ${track}.`
-        );
-      }
-    } else {
+    if (event >= midiMessageTypes.noteOff) {
       if (this.format === 1 && track === 0) {
         throw new Error(
           "Can't add voice messages to the conductor track (0) in format 1. Consider using format 0 using a different track."
@@ -3904,7 +3900,11 @@ function processTick() {
           newCount: this.loopCount
         });
       }
-      this.setTimeTicks(this._midiData.loop.start);
+      if (this._midiData.loop.type === "soft") {
+        this.jumpToTick(this._midiData.loop.start);
+      } else {
+        this.setTimeTicks(this._midiData.loop.start);
+      }
       return;
     }
     if (nextTrack.events.length <= this.eventIndexes[nextTrackIndex] || // https://github.com/spessasus/spessasynth_core/issues/21
@@ -4911,8 +4911,8 @@ var SpessaSynthSequencer = class {
   retriggerPausedNotes = true;
   /**
    * The loop count of the sequencer.
-   * If infinite, it will loop forever.
-   * If zero, the loop is disabled.
+   * If set to Infinity, it will loop forever.
+   * If set to zero, the loop is disabled.
    */
   loopCount = 0;
   /**
@@ -5300,6 +5300,29 @@ var SpessaSynthSequencer = class {
   recalculateStartTime(time) {
     this.absoluteStartTime = this.synth.currentSynthTime - time / this._playbackRate;
   }
+  /**
+   * Jumps to a MIDI tick without any further processing.
+   * @param tick The MIDI tick to jump to.
+   * @protected
+   */
+  jumpToTick(tick) {
+    if (!this._midiData) {
+      return;
+    }
+    const seconds = this._midiData.midiTicksToSeconds(tick);
+    this.callEvent("timeChange", { newTime: seconds });
+    this.recalculateStartTime(seconds);
+    this.playedTime = seconds;
+    this.eventIndexes.length = 0;
+    for (const track of this._midiData.tracks) {
+      this.eventIndexes.push(
+        Math.max(
+          0,
+          track.events.findIndex((e) => e.ticks >= tick)
+        )
+      );
+    }
+  }
   /*
   SEND MIDI METHOD ABSTRACTIONS
   These abstract the difference between spessasynth and external MIDI
@@ -10505,15 +10528,15 @@ function renderVoice(voice, timeNow, outputLeft, outputRight, reverbOutputLeft,
     volumeExcursionCentibels += -modLfoValue * modVolDepth;
     lowpassExcursion += modLfoValue * modFilterDepth;
   }
-  if (this.channelVibrato.depth > 0) {
-    const channelVibrato = getLFOValue(
+  if (
+    // Only enabled when modulation wheel is disabled (to prevent overlap)
+    this.midiControllers[midiControllers.modulationWheel] == 0 && this.channelVibrato.depth > 0
+  ) {
+    cents += getLFOValue(
       voice.startTime + this.channelVibrato.delay,
       this.channelVibrato.rate,
       timeNow
-    );
-    if (channelVibrato) {
-      cents += channelVibrato * this.channelVibrato.depth;
-    }
+    ) * this.channelVibrato.depth;
   }
   const modEnvPitchDepth = voice.modulatedGenerators[generatorTypes.modEnvToPitch];
   const modEnvFilterDepth = voice.modulatedGenerators[generatorTypes.modEnvToFilterFc];