spessasynth_lib 3.25.2 → 3.25.4

package/synthetizer/worklet_system/worklet_methods/controller_control/reset_controllers.js

@@ -11,6 +11,7 @@ import {
 } from "../../worklet_utilities/controller_tables.js";
 import { midiControllers } from "../../../../midi_parser/midi_message.js";
 import { DEFAULT_PERCUSSION, DEFAULT_SYNTH_MODE } from "../../../synth_constants.js";
+import { getDefaultBank } from "../../../../utils/xg_hacks.js";
 
 
 /**
@@ -38,7 +39,7 @@ export function resetAllControllers(log = true)
         // if preset is unlocked, switch to non-drums and call event
         if (!ch.lockPreset)
         {
-            ch.setBankSelect(0);
+            ch.setBankSelect(getDefaultBank(this.system));
             if (channelNumber % 16 === DEFAULT_PERCUSSION)
             {
                 ch.setPreset(this.drumPreset);

package/synthetizer/worklet_system/worklet_methods/soundfont_management/get_preset.js

@@ -1,3 +1,5 @@
+import { isSystemXG } from "../../../../utils/xg_hacks.js";
+
 /**
  * @this {SpessaSynthProcessor}
  * @param program {number}
@@ -10,11 +12,11 @@ export function getPreset(bank, program)
     {
         // if override soundfont
         const bankWithOffset = bank === 128 ? 128 : bank - this.soundfontBankOffset;
-        const preset = this.overrideSoundfont.getPresetNoFallback(bankWithOffset, program, this.system === "xg");
+        const preset = this.overrideSoundfont.getPresetNoFallback(bankWithOffset, program, isSystemXG(this.system));
         if (preset)
         {
             return preset;
         }
     }
-    return this.soundfontManager.getPreset(bank, program, this.system === "xg");
+    return this.soundfontManager.getPreset(bank, program, isSystemXG(this.system));
 }

package/synthetizer/worklet_system/worklet_methods/system_exclusive.js

@@ -2,6 +2,7 @@ import { arrayToHexString, consoleColors } from "../../../utils/other.js";
 import { SpessaSynthInfo, SpessaSynthWarn } from "../../../utils/loggin.js";
 import { midiControllers } from "../../../midi_parser/midi_message.js";
 import { ALL_CHANNELS_OR_DIFFERENT_ACTION } from "../message_protocol/worklet_message.js";
+import { isSystemXG } from "../../../utils/xg_hacks.js";
 
 /**
  * KeyNum: tuning
@@ -147,7 +148,7 @@ export function systemExclusive(messageData, channelOffset = 0)
                     // gm system related
                     if (messageData[3] === 0x01)
                     {
-                        SpessaSynthInfo("%cGM system on", consoleColors.info);
+                        SpessaSynthInfo("%cGM1 system on", consoleColors.info);
                         this.setSystem("gm");
                     }
                     else if (messageData[3] === 0x03)
@@ -614,7 +615,7 @@ export function systemExclusive(messageData, channelOffset = 0)
                     // XG part parameter
                 if (messageData[3] === 0x08)
                 {
-                    if (this.system !== "xg")
+                    if (!isSystemXG(this.system))
                     {
                         return;
                     }
@@ -714,7 +715,7 @@ export function systemExclusive(messageData, channelOffset = 0)
                         }
                     );
                 }
-                else if (this.system === "xg")
+                else if (isSystemXG(this.system))
                 {
                     SpessaSynthWarn(
                         `%cUnrecognized Yamaha XG SysEx: %c${arrayToHexString(messageData)}`,
@@ -726,7 +727,7 @@ export function systemExclusive(messageData, channelOffset = 0)
             }
             else
             {
-                if (this.system === "xg")
+                if (isSystemXG(this.system))
                 {
                     SpessaSynthWarn(
                         `%cUnrecognized Yamaha SysEx: %c${arrayToHexString(messageData)}`,

package/synthetizer/worklet_system/worklet_utilities/lowpass_filter.js

@@ -139,20 +139,19 @@ export class WorkletLowpassFilter
         
         // the final cutoff for this calculation
         const targetCutoff = filter.currentInitialFc + fcExcursion;
-        
+        const modulatedResonance = voice.modulatedGenerators[generatorTypes.initialFilterQ];
         /* note:
          * the check for initialFC is because of the filter optimization
          * (if cents are the maximum then the filter is open)
          * filter cannot use this optimization if it's dynamic (see #53), and
          * the filter can only be dynamic if the initial filter is not open
          */
-        if (filter.currentInitialFc > 13499 && targetCutoff > 13499 && filter.resonanceCb === 0)
+        if (filter.currentInitialFc > 13499 && targetCutoff > 13499 && modulatedResonance === 0)
         {
             filter.currentInitialFc = 13500;
             return; // filter is open
         }
         
-        const modulatedResonance = voice.modulatedGenerators[generatorTypes.initialFilterQ];
         // check if the frequency has changed. if so, calculate new coefficients
         if (Math.abs(filter.lastTargetCutoff - targetCutoff) > 1 || filter.resonanceCb !== modulatedResonance)
         {

package/synthetizer/worklet_system/worklet_utilities/worklet_processor_channel.js

@@ -27,7 +27,7 @@ import { channelPressure } from "../worklet_methods/tuning_control/channel_press
 import { pitchWheel } from "../worklet_methods/tuning_control/pitch_wheel.js";
 import { setOctaveTuning } from "../worklet_methods/tuning_control/set_octave_tuning.js";
 import { programChange } from "../worklet_methods/program_change.js";
-import { chooseBank, parseBankSelect } from "../../../utils/xg_hacks.js";
+import { chooseBank, isSystemXG, parseBankSelect } from "../../../utils/xg_hacks.js";
 import { DEFAULT_PERCUSSION } from "../../synth_constants.js";
 
 /**
@@ -205,7 +205,7 @@ class WorkletProcessorChannel
     
     get isXGChannel()
     {
-        return this.synth.system === "xg" || (this.lockPreset && this.lockedSystem === "xg");
+        return isSystemXG(this.synth.system) || (this.lockPreset && isSystemXG(this.lockedSystem));
     }
     
     /**

package/synthetizer/worklet_system/worklet_utilities/worklet_voice.js

@@ -10,6 +10,7 @@ import { WorkletVolumeEnvelope } from "./volume_envelope.js";
 import { WorkletModulationEnvelope } from "./modulation_envelope.js";
 import { addAndClampGenerator, generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
 import { Modulator } from "../../../soundfont/basic_soundfont/modulator.js";
+import { isSystemXG } from "../../../utils/xg_hacks.js";
 
 const EXCLUSIVE_CUTOFF_TIME = -2320;
 const EXCLUSIVE_MOD_CUTOFF_TIME = -1130; // less because filter shenanigans
@@ -408,7 +409,7 @@ export function getWorkletVoices(channel,
     let preset = channelObject.preset;
     if (overridePatch)
     {
-        preset = this.soundfontManager.getPreset(bank, program, this.system === "xg");
+        preset = this.soundfontManager.getPreset(bank, program, isSystemXG(this.system));
     }
     /**
      * @returns {WorkletVoice[]}

package/utils/sysex_detector.js

@@ -42,5 +42,17 @@ export function isGSOn(e)
 export function isGMOn(e)
 {
     return e.messageData[0] === 0x7E  // non realtime
-        && e.messageData[2] === 0x09; // gm system
+        && e.messageData[2] === 0x09  // gm system
+        && e.messageData[3] === 0x01; // gm1
+}
+
+/**
+ * @param e {MIDIMessage}
+ * @returns boolean
+ */
+export function isGM2On(e)
+{
+    return e.messageData[0] === 0x7E  // non realtime
+        && e.messageData[2] === 0x09  // gm system
+        && e.messageData[3] === 0x03; // gm2
 }

package/utils/xg_hacks.js

@@ -4,6 +4,17 @@ import { DEFAULT_PERCUSSION } from "../synthetizer/synth_constants.js";
 
 export const XG_SFX_VOICE = 64;
 
+const GM2_DEFAULT_BANK = 121;
+
+/**
+ * @param sys {SynthSystem}
+ * @returns {number}
+ */
+export function getDefaultBank(sys)
+{
+    return sys === "gm2" ? GM2_DEFAULT_BANK : 0;
+}
+
 /**
  * @param bankNr {number}
  * @returns {boolean}
@@ -19,7 +30,7 @@ export function isXGDrums(bankNr)
  */
 export function isValidXGMSB(bank)
 {
-    return isXGDrums(bank) || bank === XG_SFX_VOICE;
+    return isXGDrums(bank) || bank === XG_SFX_VOICE || bank === GM2_DEFAULT_BANK;
 }
 
 /**
@@ -42,7 +53,7 @@ export function parseBankSelect(bankBefore, bank, system, isLSB, isDrums, channe
     let drumsStatus = 0;
     if (isLSB)
     {
-        if (system === "xg")
+        if (isSystemXG(system))
         {
             if (!isValidXGMSB(bank))
             {
@@ -150,27 +161,33 @@ export function chooseBank(msb, lsb, isDrums, isXG)
         else
         {
             // check for SFX
-            if (msb !== XG_SFX_VOICE)
+            if (isValidXGMSB(msb))
             {
-                // if lsb is 0 and msb is not, use that
-                if (lsb === 0 && msb !== 0)
-                {
-                    return msb;
-                }
-                if (!isValidXGMSB(lsb))
-                {
-                    return lsb;
-                }
-                return 0;
+                return msb;
             }
-            else
+            // if lsb is 0 and msb is not, use that
+            if (lsb === 0 && msb !== 0)
+            {
+                return msb;
+            }
+            if (!isValidXGMSB(lsb))
             {
-                return XG_SFX_VOICE;
+                return lsb;
             }
+            return 0;
         }
     }
     else
     {
         return isDrums ? 128 : msb;
     }
+}
+
+/**
+ * @param system {SynthSystem}
+ * @returns boolean
+ */
+export function isSystemXG(system)
+{
+    return system === "gm2" || system === "xg";
 }