spessasynth_lib 3.12.2 → 3.12.3

package/@types/midi_parser/used_keys_loaded.d.ts

@@ -1,6 +1,7 @@
 /**
  * @param mid {MIDI}
  * @param soundfont {SoundFont2}
+ * @returns {Object<string, Set<string>>}
  */
 export function getUsedProgramsAndKeys(mid: MIDI, soundfont: SoundFont2): {
     [x: string]: Set<string>;

package/@types/synthetizer/worklet_system/worklet_utilities/worklet_processor_channel.d.ts

@@ -15,6 +15,7 @@
  *
  * @property {Preset} preset - the channel's preset
  * @property {boolean} lockPreset - indicates whether the program on the channel is locked
+ * @property {boolean} presetUsesOverride - indcates if the channel uses a preset from the override soundfont.
  *
  * @property {boolean} lockVibrato - indicates whether the custom vibrato is locked
  * @property {Object} channelVibrato - vibrato settings for the channel
@@ -103,6 +104,10 @@ export type WorkletProcessorChannel = {
      * - indicates whether the program on the channel is locked
      */
     lockPreset: boolean;
+    /**
+     * - indcates if the channel uses a preset from the override soundfont.
+     */
+    presetUsesOverride: boolean;
     /**
      * - indicates whether the custom vibrato is locked
      */

package/midi_parser/used_keys_loaded.js

@@ -6,6 +6,7 @@ import { messageTypes, midiControllers } from './midi_message.js'
 /**
  * @param mid {MIDI}
  * @param soundfont {SoundFont2}
+ * @returns {Object<string, Set<string>>}
  */
 export function getUsedProgramsAndKeys(mid, soundfont)
 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.12.2",
+  "version": "3.12.3",
   "description": "No compromise MIDI and SoundFont2 Synthesizer library",
   "browser": "index.js",
   "types": "@types/index.d.ts",

package/sequencer/worklet_sequencer/song_control.js

@@ -57,14 +57,19 @@ export function loadNewSequence(parsedMidi)
     if(this.midiData.embeddedSoundFont !== undefined)
     {
         SpessaSynthInfo("%cEmbedded soundfont detected! Using it.", consoleColors.recognized);
-        this.synth.reloadSoundFont(this.midiData.embeddedSoundFont);
         // set offet
         this.synth.soundfontBankOffset = this.midiData.bankOffset;
+        this.synth.reloadSoundFont(this.midiData.embeddedSoundFont, true);
         // preload all samples
-        this.synth.soundfont.samples.forEach(s => s.getAudioData());
+        this.synth.overrideSoundfont.samples.forEach(s => s.getAudioData());
     }
     else
     {
+        if(this.synth.overrideSoundfont)
+        {
+            // clean up the emdeeded soundfont
+            this.synth.clearSoundFont();
+        }
         SpessaSynthGroupCollapsed("%cPreloading samples...", consoleColors.info);
         // smart preloading: load only samples used in the midi!
         const used = getUsedProgramsAndKeys(this.midiData, this.synth.soundfont);
@@ -72,7 +77,7 @@ export function loadNewSequence(parsedMidi)
         {
             const bank = parseInt(programBank.split(":")[0]);
             const program = parseInt(programBank.split(":")[1]);
-            const preset = this.synth.soundfont.getPreset(bank, program);
+            const preset = this.synth.getPreset(bank, program);
             SpessaSynthInfo(`%cPreloading used samples on %c${preset.presetName}%c...`,
                 consoleColors.info,
                 consoleColors.recognized,