spessasynth_lib 3.25.0 → 3.25.2

package/soundfont/basic_soundfont/basic_soundfont.js

@@ -14,6 +14,7 @@ import { BasicInstrumentZone, BasicPresetZone } from "./basic_zones.js";
 import { Generator, generatorTypes } from "./generator.js";
 import { BasicInstrument } from "./basic_instrument.js";
 import { BasicPreset } from "./basic_preset.js";
+import { isXGDrums } from "../../utils/xg_hacks.js";
 
 class BasicSoundBank
 {
@@ -392,54 +393,63 @@ class BasicSoundBank
      * Get the appropriate preset, undefined if not foun d
      * @param bankNr {number}
      * @param programNr {number}
-     * @param fallbackToProgram {boolean} if true, if no exact match is found, will use any bank with the given preset
+     * @param allowXGDrums {boolean} if true, allows XG drum banks (120, 126 and 127) as drum preset
      * @return {BasicPreset}
      */
-    getPresetNoFallback(bankNr, programNr, fallbackToProgram = false)
+    getPresetNoFallback(bankNr, programNr, allowXGDrums = false)
     {
+        // check for exact match
         const p = this.presets.find(p => p.bank === bankNr && p.program === programNr);
         if (p)
         {
             return p;
         }
-        if (fallbackToProgram === false)
-        {
-            return undefined;
-        }
-        if (bankNr === 128)
+        // no match...
+        const isDrum = bankNr === 128 || (allowXGDrums && isXGDrums(bankNr));
+        if (isDrum)
         {
-            // any drum preset
-            return this.presets.find(p => p.bank === 128);
+            if (allowXGDrums)
+            {
+                // try any drum preset with matching program?
+                const p = this.presets.find(p => p.isDrumPreset(allowXGDrums) && p.program === programNr);
+                if (p)
+                {
+                    return p;
+                }
+            }
         }
-        return this.presets.find(p => p.program === programNr);
+        return undefined;
     }
     
     /**
      * Get the appropriate preset
      * @param bankNr {number}
      * @param programNr {number}
+     * @param allowXGDrums {boolean} if true, allows XG drum banks (120, 126 and 127) as drum preset
      * @returns {BasicPreset}
      */
-    getPreset(bankNr, programNr)
+    getPreset(bankNr, programNr, allowXGDrums = false)
     {
         // check for exact match
         let preset = this.presets.find(p => p.bank === bankNr && p.program === programNr);
+        const isDrums = bankNr === 128 || (allowXGDrums && isXGDrums(bankNr));
         if (!preset)
         {
             // no match...
-            if (bankNr === 128)
+            if (isDrums)
             {
                 // drum preset: find any preset with bank 128
-                preset = this.presets.find(p => p.bank === 128 && p.program === programNr);
+                preset = this.presets.find(p => p.isDrumPreset(allowXGDrums) && p.program === programNr);
                 if (!preset)
                 {
-                    preset = this.presets.find(p => p.bank === 128);
+                    // only allow 128, otherwise it would default to XG SFX
+                    preset = this.presets.find(p => p.isDrumPreset(allowXGDrums));
                 }
             }
             else
             {
                 // non-drum preset: find any preset with the given program that is not a drum preset
-                preset = this.presets.find(p => p.program === programNr && p.bank !== 128);
+                preset = this.presets.find(p => p.program === programNr && !p.isDrumPreset(allowXGDrums));
             }
             if (preset)
             {

package/soundfont/dls/dls_preset.js

@@ -15,7 +15,17 @@ export class DLSPreset extends BasicPreset
         // use stock default modulators, dls won't ever have DMOD chunk
         super(defaultModulators);
         this.program = ulInstrument & 127;
-        this.bank = (ulBank >> 8) & 127;
+        const bankMSB = (ulBank >> 8) & 127;
+        const bankLSB = ulBank & 127;
+        // switch accordingly
+        if (bankMSB > 0)
+        {
+            this.bank = bankMSB;
+        }
+        else
+        {
+            this.bank = bankLSB;
+        }
         const isDrums = ulBank >> 31;
         if (isDrums)
         {

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)
                 {