spessasynth_core 4.0.5 → 4.0.7

package/dist/index.d.ts

@@ -3293,6 +3293,11 @@ declare class BasicMIDI {
      * @returns String, Date, ArrayBuffer or undefined.
      */
     getRMIDInfo<K extends keyof RMIDInfoData>(infoType: K): RMIDInfoData[K] | undefined;
+    /**
+     * Iterates over the MIDI file, ordered by the time the events happen.
+     * @param callback The callback function to process each event.
+     */
+    iterate(callback: (event: MIDIMessage, trackNumber: number, eventIndexes: number[]) => unknown): void;
     /**
      * INTERNAL USE ONLY!
      */

package/dist/index.js

@@ -1220,22 +1220,6 @@ var DEFAULT_COPYRIGHT = "Created using SpessaSynth";
 function correctBankOffsetInternal(mid, bankOffset, soundBank) {
   let system = "gm";
   const unwantedSystems = [];
-  const eventIndexes = Array(mid.tracks.length).fill(0);
-  let remainingTracks = mid.tracks.length;
-  const findFirstEventIndex = () => {
-    let index = 0;
-    let ticks = Infinity;
-    mid.tracks.forEach((track, i) => {
-      if (eventIndexes[i] >= track.events.length) {
-        return;
-      }
-      if (track.events[eventIndexes[i]].ticks < ticks) {
-        index = i;
-        ticks = track.events[eventIndexes[i]].ticks;
-      }
-    });
-    return index;
-  };
   const ports = Array(mid.tracks.length).fill(0);
   const channelsAmount = 16 + Math.max(...mid.portChannelOffsetMap);
   const channelsInfo = [];
@@ -1249,23 +1233,15 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
       hasBankSelect: false
     });
   }
-  while (remainingTracks > 0) {
-    const trackNum = findFirstEventIndex();
-    const track = mid.tracks[trackNum];
-    if (eventIndexes[trackNum] >= track.events.length) {
-      remainingTracks--;
-      continue;
-    }
-    const e = track.events[eventIndexes[trackNum]];
-    eventIndexes[trackNum]++;
+  mid.iterate((e, trackNum) => {
     const portOffset = mid.portChannelOffsetMap[ports[trackNum]];
     if (e.statusByte === midiMessageTypes.midiPort) {
       ports[trackNum] = e.data[0];
-      continue;
+      return;
     }
     const status = e.statusByte & 240;
     if (status !== midiMessageTypes.controllerChange && status !== midiMessageTypes.programChange && status !== midiMessageTypes.systemExclusive) {
-      continue;
+      return;
     }
     if (status === midiMessageTypes.systemExclusive) {
       if (!isGSDrumsOn(e)) {
@@ -1282,11 +1258,11 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
         } else if (isGM2On(e)) {
           system = "gm2";
         }
-        continue;
+        return;
       }
       const sysexChannel = [9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15][e.data[5] & 15] + portOffset;
       channelsInfo[sysexChannel].drums = !!(e.data[7] > 0 && e.data[5] >> 4);
-      continue;
+      return;
     }
     const chNum = (e.statusByte & 15) + portOffset;
     const channel = channelsInfo[chNum];
@@ -1313,10 +1289,10 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
       );
       e.data[0] = targetPreset.program;
       if (targetPreset.isGMGSDrum && BankSelectHacks.isSystemXG(system)) {
-        continue;
+        return;
       }
       if (channel.lastBank === void 0) {
-        continue;
+        return;
       }
       channel.lastBank.data[1] = BankSelectHacks.addBankOffset(
         targetPreset.bankMSB,
@@ -1324,14 +1300,14 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
         targetPreset.isXGDrums
       );
       if (channel.lastBankLSB === void 0) {
-        continue;
+        return;
       }
       channel.lastBankLSB.data[1] = targetPreset.bankLSB;
-      continue;
+      return;
     }
     const isLSB = e.data[0] === midiControllers.bankSelectLSB;
     if (e.data[0] !== midiControllers.bankSelect && !isLSB) {
-      continue;
+      return;
     }
     channel.hasBankSelect = true;
     if (isLSB) {
@@ -1339,7 +1315,7 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
     } else {
       channel.lastBank = e;
     }
-  }
+  });
   channelsInfo.forEach((has, ch) => {
     if (has.hasBankSelect) {
       return;
@@ -1411,7 +1387,7 @@ function correctBankOffsetInternal(mid, bankOffset, soundBank) {
       indexToAdd
     );
   });
-  if (system !== "gs" && !BankSelectHacks.isSystemXG(system)) {
+  if (system === "gm" && !BankSelectHacks.isSystemXG(system)) {
     for (const m of unwantedSystems) {
       const track = mid.tracks[m.tNum];
       track.deleteEvent(track.events.indexOf(m.e));
@@ -1545,39 +1521,15 @@ function getUsedProgramsAndKeys(mid, soundBank) {
     });
   }
   const usedProgramsAndKeys = /* @__PURE__ */ new Map();
-  const eventIndexes = Array(mid.tracks.length).fill(0);
-  let remainingTracks = mid.tracks.length;
-  function findFirstEventIndex() {
-    let index = 0;
-    let ticks = Infinity;
-    mid.tracks.forEach(({ events: track }, i) => {
-      if (eventIndexes[i] >= track.length) {
-        return;
-      }
-      if (track[eventIndexes[i]].ticks < ticks) {
-        index = i;
-        ticks = track[eventIndexes[i]].ticks;
-      }
-    });
-    return index;
-  }
   const ports = mid.tracks.map((t) => t.port);
-  while (remainingTracks > 0) {
-    const trackNum = findFirstEventIndex();
-    const track = mid.tracks[trackNum].events;
-    if (eventIndexes[trackNum] >= track.length) {
-      remainingTracks--;
-      continue;
-    }
-    const event = track[eventIndexes[trackNum]];
-    eventIndexes[trackNum]++;
+  mid.iterate((event, trackNum) => {
     if (event.statusByte === midiMessageTypes.midiPort) {
       ports[trackNum] = event.data[0];
-      continue;
+      return;
     }
     const status = event.statusByte & 240;
     if (status !== midiMessageTypes.noteOn && status !== midiMessageTypes.controllerChange && status !== midiMessageTypes.programChange && status !== midiMessageTypes.systemExclusive) {
-      continue;
+      return;
     }
     const channel = (event.statusByte & 15) + mid.portChannelOffsetMap[ports[trackNum]] || 0;
     let ch = channelPresets[channel];
@@ -1597,7 +1549,7 @@ function getUsedProgramsAndKeys(mid, soundBank) {
         {
           switch (event.data[0]) {
             default:
-              continue;
+              return;
             case midiControllers.bankSelectLSB:
               ch.bankLSB = event.data[1];
               break;
@@ -1608,7 +1560,7 @@ function getUsedProgramsAndKeys(mid, soundBank) {
         break;
       case midiMessageTypes.noteOn:
         if (event.data[1] === 0) {
-          continue;
+          return;
         }
         let combos = usedProgramsAndKeys.get(ch.preset);
         if (!combos) {
@@ -1626,8 +1578,26 @@ function getUsedProgramsAndKeys(mid, soundBank) {
                 "%cXG on detected!",
                 consoleColors.recognized
               );
+            } else if (isGM2On(event)) {
+              system = "gm2";
+              SpessaSynthInfo(
+                "%cGM2 on detected!",
+                consoleColors.recognized
+              );
+            } else if (isGMOn(event)) {
+              system = "gm";
+              SpessaSynthInfo(
+                "%cGM on detected!",
+                consoleColors.recognized
+              );
+            } else if (isGSOn(event)) {
+              system = "gs";
+              SpessaSynthInfo(
+                "%cGS on detected!",
+                consoleColors.recognized
+              );
             }
-            continue;
+            return;
           }
           const sysexChannel = [9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15][event.data[5] & 15] + mid.portChannelOffsetMap[ports[trackNum]];
           const isDrum = !!(event.data[7] > 0 && event.data[5] >> 4);
@@ -1636,7 +1606,7 @@ function getUsedProgramsAndKeys(mid, soundBank) {
         }
         break;
     }
-  }
+  });
   usedProgramsAndKeys.forEach((combos, preset) => {
     if (combos.size === 0) {
       SpessaSynthInfo(
@@ -1825,22 +1795,6 @@ function modifyMIDIInternal(midi, desiredProgramChanges = [], desiredControllerC
   });
   let system = "gs";
   let addedGs = false;
-  const eventIndexes = Array(midi.tracks.length).fill(0);
-  let remainingTracks = midi.tracks.length;
-  function findFirstEventIndex() {
-    let index = 0;
-    let ticks = Infinity;
-    midi.tracks.forEach((track, i) => {
-      if (eventIndexes[i] >= track.events.length) {
-        return;
-      }
-      if (track.events[eventIndexes[i]].ticks < ticks) {
-        index = i;
-        ticks = track.events[eventIndexes[i]].ticks;
-      }
-    });
-    return index;
-  }
   const midiPorts = midi.tracks.map((t) => t.port);
   const midiPortChannelOffsets = {};
   let midiPortChannelOffset = 0;
@@ -1871,15 +1825,9 @@ function modifyMIDIInternal(midi, desiredProgramChanges = [], desiredControllerC
     coarseTranspose[transpose.channel] = coarse;
     fineTranspose[transpose.channel] = fine;
   });
-  while (remainingTracks > 0) {
-    const trackNum = findFirstEventIndex();
+  midi.iterate((e, trackNum, eventIndexes) => {
     const track = midi.tracks[trackNum];
-    if (eventIndexes[trackNum] >= track.events.length) {
-      remainingTracks--;
-      continue;
-    }
-    const index = eventIndexes[trackNum]++;
-    const e = track.events[index];
+    const index = eventIndexes[trackNum];
     const deleteThisEvent = () => {
       track.deleteEvent(index);
       eventIndexes[trackNum]--;
@@ -1891,17 +1839,17 @@ function modifyMIDIInternal(midi, desiredProgramChanges = [], desiredControllerC
     const portOffset = midiPortChannelOffsets[midiPorts[trackNum]] || 0;
     if (e.statusByte === midiMessageTypes.midiPort) {
       assignMIDIPort(trackNum, e.data[0]);
-      continue;
+      return;
     }
     if (e.statusByte <= midiMessageTypes.sequenceSpecific && e.statusByte >= midiMessageTypes.sequenceNumber) {
-      continue;
+      return;
     }
     const status = e.statusByte & 240;
     const midiChannel = e.statusByte & 15;
     const channel = midiChannel + portOffset;
     if (desiredChannelsToClear.includes(channel)) {
       deleteThisEvent();
-      continue;
+      return;
     }
     switch (status) {
       case midiMessageTypes.noteOn:
@@ -1953,7 +1901,7 @@ function modifyMIDIInternal(midi, desiredProgramChanges = [], desiredControllerC
               (c) => c.channel === channel
             );
             if (!change) {
-              continue;
+              return;
             }
             SpessaSynthInfo(
               `%cSetting %c${change.channel}%c to %c${MIDIPatchTools.toMIDIString(change)}%c. Track num: %c${trackNum}`,
@@ -2011,7 +1959,7 @@ function modifyMIDIInternal(midi, desiredProgramChanges = [], desiredControllerC
       case midiMessageTypes.programChange:
         if (channelsToChangeProgram.has(channel)) {
           deleteThisEvent();
-          continue;
+          return;
         }
         break;
       case midiMessageTypes.controllerChange:
@@ -2022,7 +1970,7 @@ function modifyMIDIInternal(midi, desiredProgramChanges = [], desiredControllerC
           );
           if (changes !== void 0) {
             deleteThisEvent();
-            continue;
+            return;
           }
           if (ccNum === midiControllers.bankSelect || ccNum === midiControllers.bankSelectLSB) {
             if (channelsToChangeProgram.has(channel)) {
@@ -2069,7 +2017,7 @@ function modifyMIDIInternal(midi, desiredProgramChanges = [], desiredControllerC
           addedGs = false;
         }
     }
-  }
+  });
   if (!addedGs && desiredProgramChanges.length > 0) {
     let index = 0;
     if (midi.tracks[0].events[0].statusByte === midiMessageTypes.trackName) {
@@ -3226,6 +3174,41 @@ var BasicMIDI2 = class _BasicMIDI {
       return void 0;
     }
   }
+  /**
+   * Iterates over the MIDI file, ordered by the time the events happen.
+   * @param callback The callback function to process each event.
+   */
+  iterate(callback) {
+    const eventIndexes = Array(this.tracks.length).fill(
+      0
+    );
+    let remainingTracks = this.tracks.length;
+    const findFirstEventIndex = () => {
+      let index = 0;
+      let ticks = Infinity;
+      this.tracks.forEach(({ events: track }, i) => {
+        if (eventIndexes[i] >= track.length) {
+          return;
+        }
+        if (track[eventIndexes[i]].ticks < ticks) {
+          index = i;
+          ticks = track[eventIndexes[i]].ticks;
+        }
+      });
+      return index;
+    };
+    while (remainingTracks > 0) {
+      const trackNum = findFirstEventIndex();
+      const track = this.tracks[trackNum].events;
+      if (eventIndexes[trackNum] >= track.length) {
+        remainingTracks--;
+        continue;
+      }
+      const event = track[eventIndexes[trackNum]];
+      callback(event, trackNum, eventIndexes);
+      eventIndexes[trackNum]++;
+    }
+  }
   /**
    * INTERNAL USE ONLY!
    */
@@ -15256,7 +15239,7 @@ var DownloadableSounds = class _DownloadableSounds extends DLSVerifier {
         consoleColors.recognized
       );
       const pgalData = aliasingChunk.data;
-      if (pgalData[0] === 2 && pgalData[1] + pgalData[2] + pgalData[3] === 0) {
+      if (pgalData[0] !== 0 || pgalData[1] !== 1 || pgalData[2] !== 2 || pgalData[3] !== 3) {
         pgalData.currentIndex += 4;
       }
       const drumInstrument = dls.instruments.find(