spessasynth_lib 3.25.2 → 3.25.3

package/midi_parser/midi_editor.js

@@ -5,8 +5,8 @@ import { consoleColors } from "../utils/other.js";
 
 import { customControllers } from "../synthetizer/worklet_system/worklet_utilities/controller_tables.js";
 import { DEFAULT_PERCUSSION } from "../synthetizer/synth_constants.js";
-import { isGMOn, isGSOn, isXGOn } from "../utils/sysex_detector.js";
-import { isXGDrums, XG_SFX_VOICE } from "../utils/xg_hacks.js";
+import { isGM2On, isGMOn, isGSOn, isXGOn } from "../utils/sysex_detector.js";
+import { isSystemXG, isXGDrums, XG_SFX_VOICE } from "../utils/xg_hacks.js";
 
 /**
  * @param ticks {number}
@@ -380,7 +380,7 @@ export function modifyMIDI(
                         };
                         
                         // on xg, add lsb
-                        if (system === "xg")
+                        if (isSystemXG(system))
                         {
                             // xg drums: msb can be 120, 126 or 127
                             if (change.isDrum)
@@ -504,9 +504,9 @@ export function modifyMIDI(
                 }
                 else
                     // check for GM/2 on
-                if (isGMOn(e))
+                if (isGMOn(e) || isGM2On(e))
                 {
-                    // that's a GM/2 system change, remove it!
+                    // that's a GM1 system change, remove it!
                     SpessaSynthInfo(
                         "%cGM/2 on detected, removing!",
                         consoleColors.info

package/midi_parser/rmidi_writer.js

@@ -7,8 +7,8 @@ import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo } from "../utils
 import { consoleColors } from "../utils/other.js";
 import { writeLittleEndian } from "../utils/byte_functions/little_endian.js";
 import { DEFAULT_PERCUSSION } from "../synthetizer/synth_constants.js";
-import { chooseBank, parseBankSelect } from "../utils/xg_hacks.js";
-import { isGMOn, isGSDrumsOn, isGSOn, isXGOn } from "../utils/sysex_detector.js";
+import { chooseBank, isSystemXG, parseBankSelect } from "../utils/xg_hacks.js";
+import { isGM2On, isGMOn, isGSDrumsOn, isGSOn, isXGOn } from "../utils/sysex_detector.js";
 
 /**
  * @enum {string}
@@ -183,12 +183,17 @@ export function writeRMIDI(
                     }
                     else if (isGMOn(e))
                     {
+                        // we do not want gm1
                         system = "gm";
                         unwantedSystems.push({
                             tNum: trackNum,
                             e: e
                         });
                     }
+                    else if (isGM2On(e))
+                    {
+                        system = "gm2";
+                    }
                     continue;
                 }
                 const sysexChannel = [9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15][e.messageData[5] & 0x0F] + portOffset;
@@ -204,7 +209,7 @@ export function writeRMIDI(
             const channel = channelsInfo[chNum];
             if (status === messageTypes.programChange)
             {
-                const isXG = system === "xg";
+                const isXG = isSystemXG(system);
                 // check if the preset for this program exists
                 const initialProgram = e.messageData[0];
                 if (channel.drums)
@@ -274,7 +279,7 @@ export function writeRMIDI(
                 {
                     // There is a preset with this bank. Add offset. For drums add the normal offset.
                     let drumBank = bank;
-                    if (system === "xg" && bank === 128)
+                    if (isSystemXG(system) && bank === 128)
                     {
                         bank = 127;
                     }
@@ -384,7 +389,7 @@ export function writeRMIDI(
             const targetBank = (soundfont.getPreset(
                 0,
                 has.program,
-                system === "xg"
+                isSystemXG(system)
             )?.bank + bankOffset) || bankOffset;
             track.splice(indexToAdd, 0, new MIDIMessage(
                 ticks,
@@ -394,7 +399,7 @@ export function writeRMIDI(
         });
         
         // make sure to put xg if gm
-        if (system !== "gs" && system !== "xg")
+        if (system !== "gs" && !isSystemXG(system))
         {
             for (const m of unwantedSystems)
             {

package/midi_parser/used_keys_loaded.js

@@ -2,7 +2,7 @@ import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo } from
 import { consoleColors } from "../utils/other.js";
 import { messageTypes, midiControllers } from "./midi_message.js";
 import { DEFAULT_PERCUSSION } from "../synthetizer/synth_constants.js";
-import { chooseBank, parseBankSelect } from "../utils/xg_hacks.js";
+import { chooseBank, isSystemXG, parseBankSelect } from "../utils/xg_hacks.js";
 import { isGSDrumsOn, isXGOn } from "../utils/sysex_detector.js";
 
 /**
@@ -42,9 +42,9 @@ export function getUsedProgramsAndKeys(soundfont)
     
     function updateString(ch)
     {
-        const bank = chooseBank(ch.bank, ch.bankLSB, ch.drums, system === "xg");
+        const bank = chooseBank(ch.bank, ch.bankLSB, ch.drums, isSystemXG(system));
         // check if this exists in the soundfont
-        let exists = soundfont.getPreset(bank, ch.program, system === "xg");
+        let exists = soundfont.getPreset(bank, ch.program, isSystemXG(system));
         ch.actualBank = exists.bank;
         ch.program = exists.program;
         ch.string = ch.actualBank + ":" + ch.program;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.25.2",
+  "version": "3.25.3",
   "description": "MIDI and SoundFont2/DLS library with no compromises",
   "browser": "index.js",
   "type": "module",