spessasynth_lib 3.25.0 → 3.25.1

package/midi_parser/midi_editor.js

@@ -5,6 +5,7 @@ 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";
 
 /**
  * @param ticks {number}
@@ -450,12 +451,7 @@ export function modifyMIDI(
             
             case messageTypes.systemExclusive:
                 // check for xg on
-                if (
-                    e.messageData[0] === 0x43 && // Yamaha
-                    e.messageData[2] === 0x4C && // XG ON
-                    e.messageData[5] === 0x7E &&
-                    e.messageData[6] === 0x00
-                )
+                if (isXGOn(e))
                 {
                     SpessaSynthInfo("%cXG system on detected", consoleColors.info);
                     system = "xg";
@@ -479,11 +475,7 @@ export function modifyMIDI(
                 }
                 else
                     // check for GS on
-                if (
-                    e.messageData[0] === 0x41    // roland
-                    && e.messageData[2] === 0x42 // GS
-                    && e.messageData[6] === 0x7F // Mode set
-                )
+                if (isGSOn(e))
                 {
                     // that's a GS on, we're done here
                     addedGs = true;
@@ -495,10 +487,7 @@ export function modifyMIDI(
                 }
                 else
                     // check for GM/2 on
-                if (
-                    e.messageData[0] === 0x7E // non realtime
-                    && e.messageData[2] === 0x09 // gm system
-                )
+                if (isGMOn(e))
                 {
                     // that's a GM/2 system change, remove it!
                     SpessaSynthInfo(
@@ -511,7 +500,7 @@ export function modifyMIDI(
         }
     }
     // check for gs
-    if (!addedGs)
+    if (!addedGs && desiredProgramChanges.length > 0)
     {
         // gs is not on, add it on the first track at index 0 (or 1 if track name is first)
         let index = 0;

package/midi_parser/rmidi_writer.js

@@ -7,6 +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";
 
 /**
  * @enum {string}
@@ -122,6 +124,7 @@ export function writeRMIDI(
          *     program: number,
          *     drums: boolean,
          *     lastBank: MIDIMessage,
+         *     lastBankLSB: MIDIMessage,
          *     hasBankSelect: boolean
          * }[]}
          */
@@ -132,6 +135,7 @@ export function writeRMIDI(
                 program: 0,
                 drums: i % 16 === DEFAULT_PERCUSSION, // drums appear on 9 every 16 channels,
                 lastBank: undefined,
+                lastBankLSB: undefined,
                 hasBankSelect: false
             });
         }
@@ -166,37 +170,18 @@ export function writeRMIDI(
             if (status === messageTypes.systemExclusive)
             {
                 // check for drum sysex
-                if (
-                    e.messageData[0] !== 0x41 || // roland
-                    e.messageData[2] !== 0x42 || // GS
-                    e.messageData[3] !== 0x12 || // GS
-                    e.messageData[4] !== 0x40 || // system parameter
-                    (e.messageData[5] & 0x10) === 0 || // part parameter
-                    e.messageData[6] !== 0x15 // drum part
-                )
+                if (!isGSDrumsOn(e))
                 {
                     // check for XG
-                    if (
-                        e.messageData[0] === 0x43 && // yamaha
-                        e.messageData[2] === 0x4C && // sXG ON
-                        e.messageData[5] === 0x7E &&
-                        e.messageData[6] === 0x00
-                    )
+                    if (isXGOn(e))
                     {
                         system = "xg";
                     }
-                    else if (
-                        e.messageData[0] === 0x41    // roland
-                        && e.messageData[2] === 0x42 // GS
-                        && e.messageData[6] === 0x7F // Mode set
-                    )
+                    else if (isGSOn(e))
                     {
                         system = "gs";
                     }
-                    else if (
-                        e.messageData[0] === 0x7E // non realtime
-                        && e.messageData[2] === 0x09 // gm system
-                    )
+                    else if (isGMOn(e))
                     {
                         system = "gm";
                         unwantedSystems.push({
@@ -213,6 +198,9 @@ export function writeRMIDI(
             
             // program change
             const chNum = (e.messageStatusByte & 0xF) + portOffset;
+            /**
+             * @type {{program: number, drums: boolean, lastBank: MIDIMessage, lastBankLSB: MIDIMessage, hasBankSelect: boolean}}
+             */
             const channel = channelsInfo[chNum];
             if (status === messageTypes.programChange)
             {
@@ -236,15 +224,24 @@ export function writeRMIDI(
                 channel.program = e.messageData[0];
                 // check if this preset exists for program and bank
                 const realBank = Math.max(0, channel.lastBank?.messageData[1] - mid.bankOffset); // make sure to take the previous bank offset into account
-                const bank = channel.drums ? 128 : realBank;
+                let bank = channel.drums ? 128 : realBank;
                 if (channel.lastBank === undefined)
                 {
                     continue;
                 }
-                if (system === "xg" && channel.drums)
+                if (system === "xg")
                 {
-                    // drums override: set the bank to 127
-                    channelsInfo[chNum].lastBank.messageData[1] = 127;
+                    if (channel.drums)
+                    {
+                        // drums override: set the bank to 127
+                        channelsInfo[chNum].lastBank.messageData[1] = 127;
+                    }
+                    else
+                    {
+                        // potential bank lsb override
+                        const bankLSB = (channel?.lastBankLSB?.messageData[1] - mid.bankOffset) || 0;
+                        bank = chooseBank(bank, bankLSB);
+                    }
                 }
                 
                 if (soundfont.presets.findIndex(p => p.bank === bank && p.program === e.messageData[0]) === -1)
@@ -252,6 +249,10 @@ export function writeRMIDI(
                     // no preset with this bank. find this program with any bank
                     const targetBank = (soundfont.presets.find(p => p.program === e.messageData[0])?.bank + bankOffset) || bankOffset;
                     channel.lastBank.messageData[1] = targetBank;
+                    if (channel?.lastBankLSB?.messageData)
+                    {
+                        channel.lastBankLSB.messageData[1] = targetBank;
+                    }
                     SpessaSynthInfo(
                         `%cNo preset %c${bank}:${e.messageData[0]}%c. Changing bank to ${targetBank}.`,
                         consoleColors.info,
@@ -265,6 +266,10 @@ export function writeRMIDI(
                     let drumBank = system === "xg" ? 127 : 0;
                     const newBank = (bank === 128 ? drumBank : realBank) + bankOffset;
                     channel.lastBank.messageData[1] = newBank;
+                    if (channel?.lastBankLSB?.messageData)
+                    {
+                        channel.lastBankLSB.messageData[1] = channel.lastBankLSB.messageData[1] - mid.bankOffset + bankOffset;
+                    }
                     SpessaSynthInfo(
                         `%cPreset %c${bank}:${e.messageData[0]}%c exists. Changing bank to ${newBank}.`,
                         consoleColors.info,
@@ -274,19 +279,45 @@ export function writeRMIDI(
                 }
                 continue;
             }
-            // we only care about bank select
-            if (e.messageData[0] !== midiControllers.bankSelect)
+            
+            // controller change
+            // we only care about bank-selects
+            const isLSB = e.messageData[0] === midiControllers.lsbForControl0BankSelect;
+            if (e.messageData[0] !== midiControllers.bankSelect && !isLSB)
             {
                 continue;
             }
             // bank select
             channel.hasBankSelect = true;
-            if (system === "xg")
+            const bankNumber = e.messageData[1];
+            // interpret
+            const intepretation = parseBankSelect(
+                channel?.lastBank?.messageData[1] || 0,
+                bankNumber,
+                system,
+                isLSB,
+                channel.drums,
+                chNum
+            );
+            if (intepretation.drumsStatus === 2)
             {
-                // check for xg drums
-                channel.drums = e.messageData[1] === 120 || e.messageData[1] === 126 || e.messageData[1] === 127;
+                channel.drums = true;
+            }
+            else if (intepretation.drumsStatus === 1)
+            {
+                channel.drums = false;
+            }
+            if (bankNumber === intepretation.newBank || channel.drums)
+            {
+                if (isLSB)
+                {
+                    channel.lastBankLSB = e;
+                }
+                else
+                {
+                    channel.lastBank = e;
+                }
             }
-            channel.lastBank = e;
         }
         
         // add missing bank selects

package/midi_parser/used_keys_loaded.js

@@ -2,6 +2,8 @@ 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 { isGSDrumsOn, isXGOn } from "../utils/sysex_detector.js";
 
 /**
  * Gets the used programs and keys for this MIDI file with a given sound bank
@@ -19,7 +21,7 @@ export function getUsedProgramsAndKeys(soundfont)
     // Find every bank:program combo and every key:velocity for each. Make sure to care about ports and drums
     const channelsAmount = 16 + mid.midiPortChannelOffsets.reduce((max, cur) => cur > max ? cur : max);
     /**
-     * @type {{program: number, bank: number, drums: boolean, string: string}[]}
+     * @type {{program: number, bank: number, bankLSB: number, drums: boolean, string: string}[]}
      */
     const channelPresets = [];
     for (let i = 0; i < channelsAmount; i++)
@@ -28,6 +30,7 @@ export function getUsedProgramsAndKeys(soundfont)
         channelPresets.push({
             program: 0,
             bank: bank,
+            bankLSB: 0,
             drums: i % 16 === DEFAULT_PERCUSSION, // drums appear on 9 every 16 channels,
             string: `${bank}:0`
         });
@@ -35,9 +38,11 @@ export function getUsedProgramsAndKeys(soundfont)
     
     function updateString(ch)
     {
+        const bank = chooseBank(ch.bank, ch.bankLSB);
         // check if this exists in the soundfont
-        let exists = soundfont.getPreset(ch.bank, ch.program);
+        let exists = soundfont.getPreset(bank, ch.program);
         ch.bank = exists.bank;
+        ch.bankLSB = 0;
         ch.program = exists.program;
         ch.string = ch.bank + ":" + ch.program;
         if (!usedProgramsAndKeys[ch.string])
@@ -124,7 +129,8 @@ export function getUsedProgramsAndKeys(soundfont)
                 break;
             
             case messageTypes.controllerChange:
-                if (event.messageData[0] !== midiControllers.bankSelect)
+                const isLSB = event.messageData[0] === midiControllers.lsbForControl0BankSelect;
+                if (event.messageData[0] !== midiControllers.bankSelect && !isLSB)
                 {
                     // we only care about bank select
                     continue;
@@ -136,24 +142,46 @@ export function getUsedProgramsAndKeys(soundfont)
                 }
                 const bank = event.messageData[1];
                 const realBank = Math.max(0, bank - mid.bankOffset);
-                if (system === "xg")
+                // interpret the bank
+                const intepretation = parseBankSelect(
+                    ch.bank,
+                    realBank,
+                    system,
+                    isLSB,
+                    ch.drums,
+                    channel
+                );
+                
+                switch (intepretation.drumsStatus)
                 {
-                    // check for xg drums
-                    const drumsBool = bank === 120 || bank === 126 || bank === 127;
-                    if (drumsBool !== ch.drums)
-                    {
+                    case 0:
+                        // no change
+                        break;
+                    
+                    case 1:
+                        // drums changed to off
                         // drum change is a program change
-                        ch.drums = drumsBool;
-                        ch.bank = ch.drums ? 128 : realBank;
+                        ch.drums = false;
+                        ch.bank = realBank;
                         updateString(ch);
-                    }
-                    else
-                    {
-                        ch.bank = ch.drums ? 128 : realBank;
-                    }
-                    continue;
+                        break;
+                    
+                    case 2:
+                        // drums changed to on
+                        // drum change is a program change
+                        ch.drums = true;
+                        ch.bank = 128;
+                        updateString(ch);
+                        break;
+                }
+                if (isLSB)
+                {
+                    ch.bankLSB = intepretation.newBank;
+                }
+                else
+                {
+                    ch.bank = ch.drums ? 128 : intepretation.newBank;
                 }
-                channelPresets[channel].bank = realBank;
                 // do not update the data, bank change doesn't change the preset
                 break;
             
@@ -169,23 +197,10 @@ export function getUsedProgramsAndKeys(soundfont)
             
             case messageTypes.systemExclusive:
                 // check for drum sysex
-                if (
-                    event.messageData[0] !== 0x41 || // roland
-                    event.messageData[2] !== 0x42 || // GS
-                    event.messageData[3] !== 0x12 || // GS
-                    event.messageData[4] !== 0x40 || // system parameter
-                    (event.messageData[5] & 0x10) === 0 || // part parameter
-                    event.messageData[6] !== 0x15 // drum pars
-                
-                )
+                if (!isGSDrumsOn(event))
                 {
                     // check for XG
-                    if (
-                        event.messageData[0] === 0x43 && // yamaha
-                        event.messageData[2] === 0x4C && // sXG ON
-                        event.messageData[5] === 0x7E &&
-                        event.messageData[6] === 0x00
-                    )
+                    if (isXGOn(event))
                     {
                         system = "xg";
                     }

package/package.json

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

package/sequencer/sequencer.js

@@ -1,4 +1,3 @@
-import { MIDI } from "../midi_parser/midi_loader.js";
 import { Synthetizer } from "../synthetizer/synthetizer.js";
 import { messageTypes } from "../midi_parser/midi_message.js";
 import { workletMessageType } from "../synthetizer/worklet_system/message_protocol/worklet_message.js";

package/synthetizer/synthetizer.js

@@ -15,7 +15,13 @@ import { DEFAULT_SYNTH_CONFIG } from "./audio_effects/effects_config.js";
 import { SoundfontManager } from "./synth_soundfont_manager.js";
 import { KeyModifierManager } from "./key_modifier_manager.js";
 import { channelConfiguration } from "./worklet_system/worklet_utilities/controller_tables.js";
-import { DEFAULT_PERCUSSION, MIDI_CHANNEL_COUNT, VOICE_CAP, WORKLET_PROCESSOR_NAME } from "./synth_constants.js";
+import {
+    DEFAULT_PERCUSSION,
+    DEFAULT_SYNTH_MODE,
+    MIDI_CHANNEL_COUNT,
+    VOICE_CAP,
+    WORKLET_PROCESSOR_NAME
+} from "./synth_constants.js";
 
 
 /**
@@ -239,6 +245,30 @@ export class Synthetizer
         });
     }
     
+    /**
+     * @type {"gm"|"gm2"|"gs"|"xg"}
+     * @private
+     */
+    _midiSystem = DEFAULT_SYNTH_MODE;
+    
+    /**
+     * The current MIDI system used by the synthesizer
+     * @returns {"gm"|"gm2"|"gs"|"xg"}
+     */
+    get midiSystem()
+    {
+        return this._midiSystem;
+    }
+    
+    /**
+     * The current MIDI system used by the synthesizer
+     * @param value {"gm"|"gm2"|"gs"|"xg"}
+     */
+    set midiSystem(value)
+    {
+        this._midiSystem = value;
+    }
+    
     /**
      * current voice amount
      * @type {number}
@@ -383,6 +413,23 @@ export class Synthetizer
                 }
                 break;
             
+            case returnMessageType.masterParameterChange:
+                /**
+                 * @type {masterParameterType}
+                 */
+                const param = messageData[0];
+                const value = messageData[1];
+                switch (param)
+                {
+                    default:
+                        break;
+                    
+                    case masterParameterType.midiSystem:
+                        this._midiSystem = value;
+                        break;
+                }
+                break;
+            
             case returnMessageType.synthesizerSnapshot:
                 if (this._snapshotCallback)
                 {