spessasynth_core 3.26.35 → 3.26.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_core",
-  "version": "3.26.35",
+  "version": "3.26.36",
   "description": "MIDI and SoundFont2/DLS library with no compromises",
   "main": "index.js",
   "type": "module",

package/src/soundfont/basic_soundfont/basic_instrument.js

@@ -1,5 +1,6 @@
 import { BasicGlobalZone } from "./basic_global_zone.js";
 import { BasicInstrumentZone } from "./basic_instrument_zone.js";
+import { SpessaSynthWarn } from "../../utils/loggin.js";
 
 export class BasicInstrument
 {
@@ -64,7 +65,8 @@ export class BasicInstrument
         const index = this.linkedPresets.indexOf(preset);
         if (index < 0)
         {
-            throw new Error(`Cannot unlink ${preset.presetName} from ${this.instrumentName}: not linked.`);
+            SpessaSynthWarn(`Cannot unlink ${preset.presetName} from ${this.instrumentName}: not linked.`);
+            return;
         }
         this.linkedPresets.splice(index, 1);
         this.instrumentZones.forEach(z => z.useCount--);
@@ -87,7 +89,7 @@ export class BasicInstrument
     {
         if (this.useCount > 0)
         {
-            throw new Error(`Cannot delete an instrument that has ${this.useCount} usages.`);
+            throw new Error(`Cannot delete an instrument that is used by: ${this.linkedPresets.map(p => p.presetName)}.`);
         }
         this.instrumentZones.forEach(z => z.deleteZone());
         this.instrumentZones.length = 0;

package/src/soundfont/basic_soundfont/basic_sample.js

@@ -249,7 +249,7 @@ export class BasicSample
     {
         if (this.useCount > 0)
         {
-            throw new Error(`Cannot delete sample that has ${this.useCount} usages.`);
+            throw new Error(`Cannot delete sample used by: ${this.linkedInstruments.map(i => i.instrumentName)}.`);
         }
         this.unlinkSample();
     }
@@ -310,7 +310,8 @@ export class BasicSample
         const index = this.linkedInstruments.indexOf(instrument);
         if (index < 0)
         {
-            throw new Error(`Cannot unlink ${instrument.instrumentName} from ${this.sampleName}: not linked.`);
+            SpessaSynthWarn(`Cannot unlink ${instrument.instrumentName} from ${this.sampleName}: not linked.`);
+            return;
         }
         this.linkedInstruments.splice(index, 1);
     }

package/src/synthetizer/audio_engine/engine_components/midi_audio_channel.js

@@ -166,7 +166,7 @@ class MidiAudioChannel
     
     /**
      * The preset currently assigned to the channel.
-     * @type {BasicPreset}
+     * @type {?BasicPreset}
      */
     preset = undefined;
     
@@ -364,7 +364,6 @@ class MidiAudioChannel
         {
             return;
         }
-        delete this.preset;
         this.preset = preset;
     }
     
@@ -464,7 +463,7 @@ class MidiAudioChannel
             isDrum: this.drumChannel,
             transposition: this.channelTransposeKeyShift + this.customControllers[customControllers.channelTransposeFine] / 100,
             bank: this.sentBank,
-            program: this.preset.program
+            program: this.preset?.program
         };
         this.synth?.onChannelPropertyChange?.(data, this.channelNumber);
     }

package/src/synthetizer/audio_engine/engine_components/voice.js

@@ -491,7 +491,14 @@ export function getVoices(channel, midiNote, velocity, realKey)
     const overridePatch = this.keyModifierManager.hasOverridePatch(channel, midiNote);
     
     let bank = channelObject.getBankSelect();
-    let program = channelObject.preset.program;
+    
+    let preset = channelObject.preset;
+    if (!preset)
+    {
+        SpessaSynthWarn(`No preset for channel ${channel}!`);
+        return [];
+    }
+    let program = preset.program;
     if (overridePatch)
     {
         const override = this.keyModifierManager.getPatch(channel, midiNote);
@@ -507,7 +514,6 @@ export function getVoices(channel, midiNote, velocity, realKey)
     }
     
     // not cached...
-    let preset = channelObject.preset;
     if (overridePatch)
     {
         preset = this.getPreset(bank, program);

package/src/synthetizer/audio_engine/engine_methods/controller_control/reset_controllers.js

@@ -29,13 +29,17 @@ export function resetAllControllers(log = true)
     this.setSystem(DEFAULT_SYNTH_MODE);
     for (let channelNumber = 0; channelNumber < this.midiAudioChannels.length; channelNumber++)
     {
-        this.midiAudioChannels[channelNumber].resetControllers();
-        
         /**
          * @type {MidiAudioChannel}
          **/
         const ch = this.midiAudioChannels[channelNumber];
         
+        ch.resetControllers();
+        // safety net
+        if (!ch.preset)
+        {
+            continue;
+        }
         // if preset is unlocked, switch to non-drums and call event
         if (!ch.lockPreset)
         {
@@ -67,11 +71,11 @@ export function resetAllControllers(log = true)
             });
         }
         
-        const presetBank = ch.preset.bank;
+        const presetBank = ch.preset?.bank;
         // call program change
         this.callEvent("programchange", {
             channel: channelNumber,
-            program: ch.preset.program,
+            program: ch.preset?.program,
             bank: presetBank
         });
         

package/src/synthetizer/audio_engine/engine_methods/note_on.js

@@ -4,6 +4,7 @@ import { customControllers } from "../engine_components/controller_tables.js";
 import { Modulator } from "../../../soundfont/basic_soundfont/modulator.js";
 import { GENERATOR_OVERRIDE_NO_CHANGE_VALUE } from "../../synth_constants.js";
 import { generatorTypes } from "../../../soundfont/basic_soundfont/generator_types.js";
+import { SpessaSynthWarn } from "../../../utils/loggin.js";
 
 /**
  * sends a "MIDI Note on message"
@@ -29,6 +30,12 @@ export function noteOn(midiNote, velocity)
         return;
     }
     
+    if (!this.preset)
+    {
+        SpessaSynthWarn(`No preset for channel ${this.channelNumber}!`);
+        return;
+    }
+    
     const realKey = midiNote + this.channelTransposeKeyShift + this.customControllers[customControllers.channelKeyShift];
     let internalMidiNote = realKey;
     
@@ -36,7 +43,7 @@ export function noteOn(midiNote, velocity)
     {
         return;
     }
-    const program = this.preset.program;
+    const program = this.preset?.program;
     const tune = this.synth.tunings[program]?.[realKey]?.midiNote;
     if (tune >= 0)
     {

package/src/synthetizer/audio_engine/engine_methods/program_change.js

@@ -1,3 +1,6 @@
+import { SpessaSynthWarn } from "../../../utils/loggin.js";
+import { BasicPreset } from "../../../soundfont/basic_soundfont/basic_preset.js";
+
 /**
  * executes a program change
  * @param programNumber {number}
@@ -14,7 +17,13 @@ export function programChange(programNumber)
     
     const isXG = this.isXGChannel;
     const p = this.synth.soundfontManager.getPreset(bank, programNumber, isXG);
-    const preset = p.preset;
+    let preset = p.preset;
+    if (!preset)
+    {
+        SpessaSynthWarn("No presets! Using empty fallback.");
+        preset = new BasicPreset(this.synth.soundfontManager.soundfontList[0].soundfont);
+        preset.presetName = "SPESSA EMPTY FALLBACK PRESET";
+    }
     this.setPreset(preset);
     this.sentBank = Math.min(128, preset.bank + p.bankOffset);
     this.synth.callEvent("programchange", {

package/src/synthetizer/audio_engine/engine_methods/render_voice.js

@@ -66,7 +66,7 @@ export function renderVoice(
     let semitones = voice.modulatedGenerators[generatorTypes.coarseTune];  // soundfont coarse tuning
     
     // midi tuning standard
-    const tuning = this.synth.tunings[this.preset.program]?.[voice.realKey];
+    const tuning = this.synth.tunings[this.preset?.program]?.[voice.realKey];
     if (tuning !== undefined && tuning?.midiNote >= 0)
     {
         // override key