spessasynth_core 4.0.10 → 4.0.12

package/dist/index.d.ts

@@ -3084,7 +3084,7 @@ declare class BasicMIDI {
      */
     tracks: MIDITrack[];
     /**
-     * The time division of the sequence, representing the number of ticks per beat.
+     * The time division of the sequence, representing the number of MIDI ticks per beat.
      */
     timeDivision: number;
     /**
@@ -3093,7 +3093,7 @@ declare class BasicMIDI {
     duration: number;
     /**
      * The tempo changes in the sequence, ordered from the last change to the first.
-     * Each change is represented by an object with a tick position and a tempo value in beats per minute.
+     * Each change is represented by an object with a MIDI tick position and a tempo value in beats per minute.
      */
     tempoChanges: TempoChange[];
     /**
@@ -3462,7 +3462,7 @@ interface RMIDInfoData {
 }
 interface TempoChange {
     /**
-     * MIDI ticks of the change.
+     * MIDI ticks of the change, absolute value from the start of the MIDI file.
      */
     ticks: number;
     /**

package/dist/index.js

@@ -2721,13 +2721,6 @@ function loadMIDIFromArrayBufferInternal(outputMIDI, arrayBuffer, fileName) {
   SpessaSynthInfo(`%cAll tracks parsed correctly!`, consoleColors.recognized);
   outputMIDI.flush(false);
   SpessaSynthGroupEnd();
-  SpessaSynthInfo(
-    `%cMIDI file parsed. Total tick time: %c${outputMIDI.lastVoiceEventTick}%c, total seconds time: %c${outputMIDI.duration}`,
-    consoleColors.info,
-    consoleColors.recognized,
-    consoleColors.info,
-    consoleColors.recognized
-  );
 }
 
 // src/utils/load_date.ts
@@ -2839,7 +2832,7 @@ var BasicMIDI2 = class _BasicMIDI {
    */
   tracks = [];
   /**
-   * The time division of the sequence, representing the number of ticks per beat.
+   * The time division of the sequence, representing the number of MIDI ticks per beat.
    */
   timeDivision = 0;
   /**
@@ -2848,7 +2841,7 @@ var BasicMIDI2 = class _BasicMIDI {
   duration = 0;
   /**
    * The tempo changes in the sequence, ordered from the last change to the first.
-   * Each change is represented by an object with a tick position and a tempo value in beats per minute.
+   * Each change is represented by an object with a MIDI tick position and a tempo value in beats per minute.
    */
   tempoChanges = [{ ticks: 0, tempo: 120 }];
   /**
@@ -2985,15 +2978,24 @@ var BasicMIDI2 = class _BasicMIDI {
    * @returns The time in seconds.
    */
   midiTicksToSeconds(ticks) {
+    ticks = Math.max(ticks, 0);
+    if (this.tempoChanges.length < 1) {
+      throw new Error(
+        "There are no tempo changes in the sequence. At least one is needed."
+      );
+    }
+    if (this.tempoChanges[this.tempoChanges.length - 1].ticks !== 0) {
+      throw new Error(
+        `The last tempo change is not at 0 ticks. Got ${this.tempoChanges[this.tempoChanges.length - 1].ticks} ticks.`
+      );
+    }
+    let tempoIndex = this.tempoChanges.findIndex((v) => v.ticks <= ticks);
     let totalSeconds = 0;
-    while (ticks > 0) {
-      const tempo = this.tempoChanges.find((v) => v.ticks < ticks);
-      if (!tempo) {
-        return totalSeconds;
-      }
-      const timeSinceLastTempo = ticks - tempo.ticks;
-      totalSeconds += timeSinceLastTempo * 60 / (tempo.tempo * this.timeDivision);
-      ticks -= timeSinceLastTempo;
+    while (tempoIndex < this.tempoChanges.length) {
+      const tempo = this.tempoChanges[tempoIndex++];
+      const ticksSinceLastTempo = ticks - tempo.ticks;
+      totalSeconds += ticksSinceLastTempo * 60 / (tempo.tempo * this.timeDivision);
+      ticks = tempo.ticks;
     }
     return totalSeconds;
   }
@@ -3263,9 +3265,6 @@ var BasicMIDI2 = class _BasicMIDI {
         const e = track.events[i];
         if (e.statusByte >= 128 && e.statusByte < 240) {
           trackHasVoiceMessages = true;
-          for (let j = 0; j < e.data.length; j++) {
-            e.data[j] = Math.min(127, e.data[j]);
-          }
           if (e.ticks > this.lastVoiceEventTick) {
             this.lastVoiceEventTick = e.ticks;
           }
@@ -3525,10 +3524,19 @@ 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;
     }
-    SpessaSynthInfo("%cSuccess!", consoleColors.recognized);
+    SpessaSynthInfo(
+      `%cMIDI file parsed. Total tick time: %c${this.lastVoiceEventTick}%c, total seconds time: %c${formatTime(Math.ceil(this.duration)).time}`,
+      consoleColors.info,
+      consoleColors.recognized,
+      consoleColors.info,
+      consoleColors.recognized
+    );
     SpessaSynthGroupEnd();
   }
 };
@@ -4727,6 +4735,8 @@ function setTimeToInternal(time, ticks = void 0) {
       Array.from(defaultControllerArray)
     );
   }
+  let savedTempo = void 0;
+  let savedTempoTrack = 0;
   function resetAllControllers(chan) {
     pitchWheels[chan] = 8192;
     if (savedControllers?.[chan] === void 0) {
@@ -4806,6 +4816,12 @@ function setTimeToInternal(time, ticks = void 0) {
         }
         break;
       }
+      case midiMessageTypes.setTempo:
+        const tempoBPM = 6e7 / readBigEndian(event.data, 3);
+        this.oneTickToSeconds = 60 / (tempoBPM * this._midiData.timeDivision);
+        savedTempo = event;
+        savedTempoTrack = trackIndex;
+        break;
       default:
         this.processEvent(event, trackIndex);
         break;
@@ -4886,6 +4902,12 @@ function setTimeToInternal(time, ticks = void 0) {
       }
     }
   }
+  if (savedTempo) {
+    this.callEvent("metaEvent", {
+      event: savedTempo,
+      trackIndex: savedTempoTrack
+    });
+  }
   if (this.paused) {
     this.pausedTime = this.playedTime;
   }
@@ -7984,11 +8006,15 @@ function selectPreset(presets, patch, system) {
     returnReplacement(p);
     return p;
   }
-  const bank = Math.max(bankMSB, bankLSB);
-  p = matchingPrograms.find((p2) => p2.bankLSB === bank || p2.bankMSB === bank);
-  if (p) {
-    returnReplacement(p);
-    return p;
+  if (bankLSB !== 64 || !isXG) {
+    const bank = Math.max(bankMSB, bankLSB);
+    p = matchingPrograms.find(
+      (p2) => p2.bankLSB === bank || p2.bankMSB === bank
+    );
+    if (p) {
+      returnReplacement(p);
+      return p;
+    }
   }
   returnReplacement(matchingPrograms[0]);
   return matchingPrograms[0];
@@ -8795,6 +8821,12 @@ var Voice = class _Voice {
   }
 };
 function getVoicesForPresetInternal(preset, midiNote, velocity, realKey) {
+  const cached = this.getCachedVoice(preset, midiNote, velocity);
+  if (cached !== void 0) {
+    return cached.map(
+      (v) => Voice.copyFrom(v, this.currentSynthTime, realKey)
+    );
+  }
   const voices = preset.getSynthesisData(midiNote, velocity).reduce((voices2, synthesisData) => {
     if (synthesisData.sample.getAudioData() === void 0) {
       SpessaSynthWarn(
@@ -8836,15 +8868,16 @@ function getVoicesForPresetInternal(preset, midiNote, velocity, realKey) {
       Math.floor(sampleData.length) - 1,
       loopingMode
     );
+    let voiceVelocity = velocity;
     if (generators[generatorTypes.velocity] > -1) {
-      velocity = generators[generatorTypes.velocity];
+      voiceVelocity = generators[generatorTypes.velocity];
     }
     voices2.push(
       new Voice(
         this.sampleRate,
         audioSample,
         midiNote,
-        velocity,
+        voiceVelocity,
         this.currentSynthTime,
         targetKey,
         realKey,
@@ -8870,19 +8903,8 @@ function getVoicesInternal(channel, midiNote, velocity, realKey) {
     SpessaSynthWarn(`No preset for channel ${channel}!`);
     return [];
   }
-  let patch = {
-    ...preset
-  };
-  if (overridePatch) {
-    patch = this.keyModifierManager.getPatch(channel, midiNote);
-  }
-  const cached = this.getCachedVoice(patch, midiNote, velocity);
-  if (cached !== void 0) {
-    return cached.map(
-      (v) => Voice.copyFrom(v, this.currentSynthTime, realKey)
-    );
-  }
   if (overridePatch) {
+    const patch = this.keyModifierManager.getPatch(channel, midiNote);
     preset = this.soundBankManager.getPreset(
       patch,
       this.privateProps.masterParameters.midiSystem
@@ -11121,7 +11143,7 @@ function getLookup(value) {
   return 0;
 }
 function portamentoTimeToSeconds(time, distance) {
-  return getLookup(time) * (distance / 30);
+  return getLookup(time) * (distance / 36);
 }
 
 // src/synthesizer/audio_engine/engine_methods/note_on.ts