spessasynth_core 3.26.4 → 3.26.5

package/package.json

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

package/src/midi/midi_tools/used_keys_loaded.js

@@ -4,11 +4,12 @@ import { messageTypes, midiControllers } from "../midi_message.js";
 import { DEFAULT_PERCUSSION } from "../../synthetizer/synth_constants.js";
 import { chooseBank, isSystemXG, parseBankSelect } from "../../utils/xg_hacks.js";
 import { isGSDrumsOn, isXGOn } from "../../utils/sysex_detector.js";
+import { SoundFontManager } from "../../synthetizer/audio_engine/engine_components/soundfont_manager.js";
 
 /**
  * Gets the used programs and keys for this MIDI file with a given sound bank
  * @this {BasicMIDI}
- * @param soundfont {BasicSoundBank|SoundFontManager} - the sound bank
+ * @param soundfont {SoundFontManager|BasicSoundBank} - the sound bank
  * @returns {Object<string, Set<string>>} Object<bank:program, Set<key-velocity>>
  */
 export function getUsedProgramsAndKeys(soundfont)
@@ -44,9 +45,27 @@ export function getUsedProgramsAndKeys(soundfont)
     {
         const bank = chooseBank(ch.bank, ch.bankLSB, ch.drums, isSystemXG(system));
         // check if this exists in the soundfont
-        let exists = soundfont.getPreset(bank, ch.program, isSystemXG(system));
-        ch.actualBank = exists.bank;
-        ch.program = exists.program;
+        let existsBank, existsProgram;
+        if (soundfont instanceof SoundFontManager)
+        {
+            /**
+             * @type {{preset: BasicPreset, bankOffset: number}}
+             */
+            let exists = soundfont.getPreset(bank, ch.program, isSystemXG(system));
+            existsBank = exists.preset.bank + exists.bankOffset;
+            existsProgram = exists.preset.program;
+        }
+        else
+        {
+            /**
+             * @type {BasicPreset}
+             */
+            let exists = soundfont.getPreset(bank, ch.program, isSystemXG(system));
+            existsBank = exists.bank;
+            existsProgram = exists.program;
+        }
+        ch.actualBank = existsBank;
+        ch.program = existsProgram;
         ch.string = ch.actualBank + ":" + ch.program;
         if (!usedProgramsAndKeys[ch.string])
         {
@@ -147,19 +166,18 @@ export function getUsedProgramsAndKeys(soundfont)
                     continue;
                 }
                 const bank = event.messageData[1];
-                const realBank = Math.max(0, bank - mid.bankOffset);
                 if (isLSB)
                 {
-                    ch.bankLSB = realBank;
+                    ch.bankLSB = bank;
                 }
                 else
                 {
-                    ch.bank = realBank;
+                    ch.bank = bank;
                 }
                 // interpret the bank
                 const intepretation = parseBankSelect(
                     ch.bank,
-                    realBank,
+                    bank,
                     system,
                     isLSB,
                     ch.drums,

package/src/sequencer/song_control.js

@@ -57,41 +57,36 @@ export function loadNewSequence(parsedMidi, autoPlay = true)
      */
     this.midiData = parsedMidi;
     
+    // clear old embedded bank if exists
+    this.synth.clearEmbeddedBank();
+    
     // check for embedded soundfont
     if (this.midiData.embeddedSoundFont !== undefined)
     {
         SpessaSynthInfo("%cEmbedded soundfont detected! Using it.", consoleColors.recognized);
         this.synth.setEmbeddedSoundFont(this.midiData.embeddedSoundFont, this.midiData.bankOffset);
     }
-    else
+    
+    SpessaSynthGroupCollapsed("%cPreloading samples...", consoleColors.info);
+    // smart preloading: load only samples used in the midi!
+    const used = this.midiData.getUsedProgramsAndKeys(this.synth.soundfontManager);
+    for (const [programBank, combos] of Object.entries(used))
     {
-        if (this.synth.overrideSoundfont)
-        {
-            // clean up the embedded soundfont
-            this.synth.clearSoundFont(true, true);
-        }
-        SpessaSynthGroupCollapsed("%cPreloading samples...", consoleColors.info);
-        // smart preloading: load only samples used in the midi!
-        const used = this.midiData.getUsedProgramsAndKeys(this.synth.soundfontManager);
-        for (const [programBank, combos] of Object.entries(used))
+        const [bank, program] = programBank.split(":").map(Number);
+        const preset = this.synth.getPreset(bank, program);
+        SpessaSynthInfo(
+            `%cPreloading used samples on %c${preset.presetName}%c...`,
+            consoleColors.info,
+            consoleColors.recognized,
+            consoleColors.info
+        );
+        for (const combo of combos)
         {
-            const bank = parseInt(programBank.split(":")[0]);
-            const program = parseInt(programBank.split(":")[1]);
-            const preset = this.synth.getPreset(bank, program);
-            SpessaSynthInfo(
-                `%cPreloading used samples on %c${preset.presetName}%c...`,
-                consoleColors.info,
-                consoleColors.recognized,
-                consoleColors.info
-            );
-            for (const combo of combos)
-            {
-                const split = combo.split("-");
-                preset.preloadSpecific(parseInt(split[0]), parseInt(split[1]));
-            }
+            const [midiNote, velocity] = combo.split("-").map(Number);
+            this.synth.getVoicesForPreset(preset, bank, program, midiNote, velocity, midiNote);
         }
-        SpessaSynthGroupEnd();
     }
+    SpessaSynthGroupEnd();
     
     /**
      * the midi track data

package/src/soundfont/basic_soundfont/basic_preset.js

@@ -44,12 +44,6 @@ export class BasicPreset
      */
     presetZones = [];
     
-    /**
-     * Stores already found getSamplesAndGenerators for reuse
-     * @type {SampleAndGenerators[][][]}
-     */
-    foundSamplesAndGenerators = [];
-    
     /**
      * unused metadata
      * @type {number}
@@ -73,15 +67,6 @@ export class BasicPreset
     constructor(parentSoundBank)
     {
         this.parentSoundBank = parentSoundBank;
-        for (let i = 0; i < 128; i++)
-        {
-            this.foundSamplesAndGenerators[i] = [];
-        }
-    }
-    
-    clearCache()
-    {
-        this.foundSamplesAndGenerators = [];
     }
     
     /**
@@ -136,34 +121,13 @@ export class BasicPreset
     }
     
     /**
-     * Preloads a specific key/velocity combo
-     * @param key {number}
-     * @param velocity {number}
-     */
-    preloadSpecific(key, velocity)
-    {
-        this.getSamplesAndGenerators(key, velocity).forEach(samandgen =>
-        {
-            if (!samandgen.sample.isSampleLoaded)
-            {
-                samandgen.sample.getAudioData();
-            }
-        });
-    }
-    
-    /**
-     * Returns generatorTranslator and generators for given note
+     * Returns samples and generators for given note
      * @param midiNote {number}
      * @param velocity {number}
      * @returns {SampleAndGenerators[]}
      */
     getSamplesAndGenerators(midiNote, velocity)
     {
-        const memorized = this.foundSamplesAndGenerators[midiNote][velocity];
-        if (memorized)
-        {
-            return memorized;
-        }
         
         if (this.presetZones.length < 1)
         {
@@ -333,9 +297,6 @@ export class BasicPreset
                 });
             });
         });
-        
-        // save and return
-        this.foundSamplesAndGenerators[midiNote][velocity] = parsedGeneratorsAndSamples;
         return parsedGeneratorsAndSamples;
     }
 }

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

@@ -361,7 +361,6 @@ class MidiAudioChannel
         {
             this.drumChannel = false;
         }
-        this.presetUsesOverride = false;
         this.synth.callEvent("drumchange", {
             channel: this.channelNumber,
             isDrumChannel: this.drumChannel

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

@@ -1,5 +1,6 @@
-import { SpessaSynthWarn } from "../../../utils/loggin.js";
+import { SpessaSynthInfo, SpessaSynthWarn } from "../../../utils/loggin.js";
 import { isXGDrums } from "../../../utils/xg_hacks.js";
+import { EMBEDDED_SOUND_BANK_ID } from "../../synth_constants.js";
 
 /**
  * @typedef {Object} SoundFontType
@@ -47,7 +48,8 @@ export class SoundFontManager
             const presets = new Set();
             for (const p of font.soundfont.presets)
             {
-                const presetString = `${p.bank + font.bankOffset}-${p.program}`;
+                const bank = Math.min(128, p.bank + font.bankOffset);
+                const presetString = `${bank}-${p.program}`;
                 if (presets.has(presetString))
                 {
                     continue;
@@ -86,11 +88,8 @@ export class SoundFontManager
      */
     reloadManager(soundFont)
     {
-        /**
-         * All the soundfonts, ordered from the most important to the least.
-         * @type {SoundFontType[]}
-         */
-        this.soundfontList = [];
+        // do not clear the embedded bank
+        this.soundfontList = this.soundfontList.filter(sf => sf.id === EMBEDDED_SOUND_BANK_ID);
         this.soundfontList.push({
             id: "main",
             bankOffset: 0,
@@ -114,7 +113,7 @@ export class SoundFontManager
         const index = this.soundfontList.findIndex(s => s.id === id);
         if (index === -1)
         {
-            SpessaSynthWarn(`No soundfont with id of "${id}" found. Aborting!`);
+            SpessaSynthInfo(`No soundfont with id of "${id}" found. Aborting!`);
             return;
         }
         delete this.soundfontList[index].soundfont.presets;
@@ -145,6 +144,15 @@ export class SoundFontManager
         this.generatePresetList();
     }
     
+    /**
+     * Gets the current soundfont order
+     * @returns {string[]}
+     */
+    getCurrentSoundFontOrder()
+    {
+        return this.soundfontList.map(s => s.id);
+    }
+    
     // noinspection JSUnusedGlobalSymbols
     /**
      * Rearranges the soundfonts
@@ -163,7 +171,7 @@ export class SoundFontManager
      * @param bankNumber {number}
      * @param programNumber {number}
      * @param allowXGDrums {boolean} if true, allows XG drum banks (120, 126 and 127) as drum preset
-     * @returns {BasicPreset} the preset
+     * @returns {{preset: BasicPreset, bankOffset: number}} the preset and its bank offset
      */
     getPreset(bankNumber, programNumber, allowXGDrums = false)
     {
@@ -171,21 +179,24 @@ export class SoundFontManager
         {
             throw new Error("No soundfonts! Did you forget to add one?");
         }
+        const isDrum = bankNumber === 128 || (allowXGDrums && isXGDrums(bankNumber));
         for (const sf of this.soundfontList)
         {
             // check for the preset (with given offset)
             const preset = sf.soundfont.getPresetNoFallback(
-                bankNumber - sf.bankOffset,
+                bankNumber === 128 ? 128 : bankNumber - sf.bankOffset,
                 programNumber,
                 allowXGDrums
             );
             if (preset !== undefined)
             {
-                return preset;
+                return {
+                    preset: preset,
+                    bankOffset: sf.bankOffset
+                };
             }
             // if not found, advance to the next soundfont
         }
-        const isDrum = bankNumber === 128 || (allowXGDrums && isXGDrums(bankNumber));
         // if none found, return the first correct preset found
         if (!isDrum)
         {
@@ -195,11 +206,18 @@ export class SoundFontManager
                     allowXGDrums));
                 if (preset)
                 {
-                    return preset;
+                    return {
+                        preset: preset,
+                        bankOffset: sf.bankOffset
+                    };
                 }
             }
             // if nothing at all, use the first preset
-            return this.soundfontList[0].soundfont.presets[0];
+            const sf = this.soundfontList[0];
+            return {
+                preset: sf.soundfont.presets[0],
+                bankOffset: sf.bankOffset
+            };
         }
         else
         {
@@ -209,17 +227,27 @@ export class SoundFontManager
                 const p = sf.soundfont.presets.find(p => p.isDrumPreset(allowXGDrums) && p.program === programNumber);
                 if (p)
                 {
-                    return p;
+                    return {
+                        preset: p,
+                        bankOffset: sf.bankOffset
+                    };
                 }
                 // check for any drum preset
                 const preset = sf.soundfont.presets.find(p => p.isDrumPreset(allowXGDrums));
                 if (preset)
                 {
-                    return preset;
+                    return {
+                        preset: preset,
+                        bankOffset: sf.bankOffset
+                    };
                 }
             }
             // if nothing at all, use the first preset
-            return this.soundfontList[0].soundfont.presets[0];
+            const sf = this.soundfontList[0];
+            return {
+                preset: sf.soundfont.presets[0],
+                bankOffset: sf.bankOffset
+            };
         }
     }
     

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

@@ -9,7 +9,6 @@ import { VolumeEnvelope } from "./volume_envelope.js";
 import { ModulationEnvelope } 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
@@ -162,12 +161,6 @@ class Voice
      */
     isInRelease = false;
     
-    /**
-     * MIDI channel number.
-     * @type {number}
-     */
-    channelNumber = 0;
-    
     /**
      * Velocity of the note.
      * @type {number}
@@ -272,7 +265,6 @@ class Voice
      * @param audioSample {AudioSample}
      * @param midiNote {number}
      * @param velocity {number}
-     * @param channel {number}
      * @param currentTime {number}
      * @param targetKey {number}
      * @param realKey {number}
@@ -284,7 +276,6 @@ class Voice
         audioSample,
         midiNote,
         velocity,
-        channel,
         currentTime,
         targetKey,
         realKey,
@@ -301,7 +292,6 @@ class Voice
         
         this.velocity = velocity;
         this.midiNote = midiNote;
-        this.channelNumber = channel;
         this.startTime = currentTime;
         this.targetKey = targetKey;
         this.realKey = realKey;
@@ -333,7 +323,6 @@ class Voice
             sample,
             voice.midiNote,
             voice.velocity,
-            voice.channelNumber,
             currentTime,
             voice.targetKey,
             realKey,
@@ -372,53 +361,21 @@ class Voice
 }
 
 /**
- * @param channel {number} a hint for the processor to recalculate sample cursors when sample dumping
+ * @param preset {BasicPreset} the preset to get voices for
+ * @param bank {number} the bank to cache the voices in
+ * @param program {number} program to cache the voices in
  * @param midiNote {number} the MIDI note to use
  * @param velocity {number} the velocity to use
  * @param realKey {number} the real MIDI note if the "midiNote" was changed by MIDI Tuning Standard
  * @this {SpessaSynthProcessor}
  * @returns {Voice[]} output is an array of Voices
  */
-export function getVoices(channel,
-                          midiNote,
-                          velocity,
-                          realKey)
+export function getVoicesForPreset(preset, bank, program, midiNote, velocity, realKey)
 {
     /**
      * @type {Voice[]}
      */
-    let voices;
-    const channelObject = this.midiAudioChannels[channel];
-    
-    // override patch
-    const overridePatch = this.keyModifierManager.hasOverridePatch(channel, midiNote);
-    
-    let bank = channelObject.getBankSelect();
-    let program = channelObject.preset.program;
-    if (overridePatch)
-    {
-        const override = this.keyModifierManager.getPatch(channel, midiNote);
-        bank = override.bank;
-        program = override.program;
-    }
-    
-    const cached = this.getCachedVoice(bank, program, midiNote, velocity);
-    // if cached, return it!
-    if (cached !== undefined)
-    {
-        return cached.map(v => Voice.copy(v, this.currentSynthTime, realKey));
-    }
-    
-    // not cached...
-    let preset = channelObject.preset;
-    if (overridePatch)
-    {
-        preset = this.soundfontManager.getPreset(bank, program, isSystemXG(this.system));
-    }
-    /**
-     * @returns {Voice[]}
-     */
-    voices = preset.getSamplesAndGenerators(midiNote, velocity)
+    const voices = preset.getSamplesAndGenerators(midiNote, velocity)
         .reduce((voices, sampleAndGenerators) =>
         {
             if (sampleAndGenerators.sample.getAudioData() === undefined)
@@ -501,7 +458,6 @@ export function getVoices(channel,
                     audioSample,
                     midiNote,
                     velocity,
-                    channel,
                     this.currentSynthTime,
                     targetKey,
                     realKey,
@@ -515,4 +471,44 @@ export function getVoices(channel,
     this.setCachedVoice(bank, program, midiNote, velocity, voices.map(v =>
         Voice.copy(v, this.currentSynthTime, realKey)));
     return voices;
+}
+
+/**
+ * @param channel {number} a hint for the processor to recalculate sample cursors when sample dumping
+ * @param midiNote {number} the MIDI note to use
+ * @param velocity {number} the velocity to use
+ * @param realKey {number} the real MIDI note if the "midiNote" was changed by MIDI Tuning Standard
+ * @this {SpessaSynthProcessor}
+ * @returns {Voice[]} output is an array of Voices
+ */
+export function getVoices(channel, midiNote, velocity, realKey)
+{
+    const channelObject = this.midiAudioChannels[channel];
+    
+    // override patch
+    const overridePatch = this.keyModifierManager.hasOverridePatch(channel, midiNote);
+    
+    let bank = channelObject.getBankSelect();
+    let program = channelObject.preset.program;
+    if (overridePatch)
+    {
+        const override = this.keyModifierManager.getPatch(channel, midiNote);
+        bank = override.bank;
+        program = override.program;
+    }
+    
+    const cached = this.getCachedVoice(bank, program, midiNote, velocity);
+    // if cached, return it!
+    if (cached !== undefined)
+    {
+        return cached.map(v => Voice.copy(v, this.currentSynthTime, realKey));
+    }
+    
+    // not cached...
+    let preset = channelObject.preset;
+    if (overridePatch)
+    {
+        preset = this.getPreset(bank, program);
+    }
+    return this.getVoicesForPreset(preset, bank, program, midiNote, velocity, realKey);
 }

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

@@ -43,7 +43,6 @@ export function resetAllControllers(log = true)
             if (channelNumber % 16 === DEFAULT_PERCUSSION)
             {
                 ch.setPreset(this.drumPreset);
-                ch.presetUsesOverride = this.defaultDrumsUsesOverride;
                 ch.drumChannel = true;
                 this.callEvent("drumchange", {
                     channel: channelNumber,
@@ -53,7 +52,6 @@ export function resetAllControllers(log = true)
             else
             {
                 ch.drumChannel = false;
-                ch.presetUsesOverride = this.defaultDrumsUsesOverride;
                 ch.setPreset(this.defaultPreset);
                 this.callEvent("drumchange", {
                     channel: channelNumber,
@@ -70,13 +68,11 @@ export function resetAllControllers(log = true)
         }
         
         const presetBank = ch.preset.bank;
-        const sentBank = presetBank === 128 ? 128 : (ch.presetUsesOverride ? presetBank + this.soundfontBankOffset : presetBank);
-        
         // call program change
         this.callEvent("programchange", {
             channel: channelNumber,
             program: ch.preset.program,
-            bank: sentBank
+            bank: presetBank
         });
         
         for (let ccNum = 0; ccNum < 128; ccNum++)

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

@@ -11,51 +11,16 @@ export function programChange(programNumber)
     }
     // always 128 for percussion
     let bank = this.getBankSelect();
-    let sentBank;
-    /**
-     * @type {BasicPreset}
-     */
-    let preset;
     
     const isXG = this.isXGChannel;
-    // check if override
-    if (this.synth.overrideSoundfont)
-    {
-        const bankWithOffset = bank === 128 ? 128 : bank - this.synth.soundfontBankOffset;
-        const p = this.synth.overrideSoundfont.getPresetNoFallback(
-            bankWithOffset,
-            programNumber,
-            isXG
-        );
-        if (p)
-        {
-            sentBank = p.bank === 128 ? 128 : p.bank + this.synth.soundfontBankOffset;
-            preset = p;
-            this.presetUsesOverride = true;
-        }
-        else
-        {
-            preset = this.synth.soundfontManager.getPreset(bank, programNumber, isXG);
-            const offset = this.synth.soundfontManager.soundfontList
-                .find(s => s.soundfont === preset.parentSoundBank).bankOffset;
-            sentBank = preset.bank - offset;
-            this.presetUsesOverride = false;
-        }
-    }
-    else
-    {
-        preset = this.synth.soundfontManager.getPreset(bank, programNumber, isXG);
-        const offset = this.synth.soundfontManager.soundfontList
-            .find(s => s.soundfont === preset.parentSoundBank).bankOffset;
-        sentBank = preset.bank - offset;
-        this.presetUsesOverride = false;
-    }
+    const p = this.synth.soundfontManager.getPreset(bank, programNumber, isXG);
+    const preset = p.preset;
     this.setPreset(preset);
-    this.sentBank = sentBank;
+    this.sentBank = Math.min(128, preset.bank + p.bankOffset);
     this.synth.callEvent("programchange", {
         channel: this.channelNumber,
         program: preset.program,
-        bank: sentBank
+        bank: this.sentBank
     });
     this.sendChannelProperty();
 }

package/src/synthetizer/audio_engine/engine_methods/soundfont_management/embedded_sound_bank.js

@@ -0,0 +1,43 @@
+import { loadSoundFont } from "../../../../soundfont/load_soundfont.js";
+import { SpessaSynthInfo } from "../../../../utils/loggin.js";
+import { consoleColors } from "../../../../utils/other.js";
+import { EMBEDDED_SOUND_BANK_ID } from "../../../synth_constants.js";
+
+/**
+ * @this {SpessaSynthProcessor}
+ */
+export function clearEmbeddedBank()
+{
+    if (this.soundfontManager.soundfontList.some(s => s.id === EMBEDDED_SOUND_BANK_ID))
+    {
+        this.soundfontManager.deleteSoundFont(EMBEDDED_SOUND_BANK_ID);
+    }
+}
+
+/**
+ * Sets the embedded (RMI soundfont)
+ * @param font {ArrayBuffer}
+ * @param offset {number}
+ * @this {SpessaSynthProcessor}
+ */
+export function setEmbeddedSoundFont(font, offset)
+{
+    // the embedded bank is set as the first bank in the manager,
+    // with a special ID that does not clear when reloadManager is performed.
+    this.soundfontBankOffset = offset;
+    const loadedFont = loadSoundFont(font);
+    this.soundfontManager.addNewSoundFont(loadedFont, EMBEDDED_SOUND_BANK_ID, offset);
+    // rearrange so the embedded is first (most important as it overrides all others)
+    const order = this.soundfontManager.getCurrentSoundFontOrder();
+    order.pop();
+    order.unshift(EMBEDDED_SOUND_BANK_ID);
+    this.soundfontManager.rearrangeSoundFonts(order);
+    
+    
+    // apply snapshot again if applicable
+    if (this._snapshot !== undefined)
+    {
+        this.applySynthesizerSnapshot(this._snapshot);
+    }
+    SpessaSynthInfo(`%cEmbedded sound bank set at offset %c${offset}`, consoleColors.recognized, consoleColors.value);
+}

package/src/synthetizer/audio_engine/engine_methods/soundfont_management/get_preset.js

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

package/src/synthetizer/audio_engine/engine_methods/soundfont_management/update_preset_list.js

@@ -7,28 +7,13 @@ export function updatePresetList()
      * @type {{bank: number, presetName: string, program: number}[]}
      */
     const mainFont = this.soundfontManager.getPresetList();
-    if (this.overrideSoundfont !== undefined)
-    {
-        this.overrideSoundfont.presets.forEach(p =>
-        {
-            const bankCheck = p.bank === 128 ? 128 : p.bank + this.soundfontBankOffset;
-            const exists = mainFont.find(pr => pr.bank === bankCheck && pr.program === p.program);
-            if (exists !== undefined)
-            {
-                exists.presetName = p.presetName;
-            }
-            else
-            {
-                mainFont.push({
-                    presetName: p.presetName,
-                    bank: bankCheck,
-                    program: p.program
-                });
-            }
-        });
-    }
     this.clearCache();
     this.callEvent("presetlistchange", mainFont);
     this.getDefaultPresets();
+    // unlock presets
+    this.midiAudioChannels.forEach(c =>
+    {
+        c.setPresetLock(false);
+    });
     this.resetAllControllers(false);
 }

package/src/synthetizer/audio_engine/main_processor.js

@@ -9,13 +9,11 @@ import { masterParameterType, setMasterParameter } from "./engine_methods/contro
 import { resetAllControllers } from "./engine_methods/controller_control/reset_controllers.js";
 import { SoundFontManager } from "./engine_components/soundfont_manager.js";
 import { KeyModifierManager } from "./engine_components/key_modifier_manager.js";
-import { getVoices } from "./engine_components/voice.js";
+import { getVoices, getVoicesForPreset } from "./engine_components/voice.js";
 import { PAN_SMOOTHING_FACTOR } from "./engine_components/stereo_panner.js";
 import { stopAllChannels } from "./engine_methods/stopping_notes/stop_all_channels.js";
-import { setEmbeddedSoundFont } from "./engine_methods/soundfont_management/set_embedded_sound_font.js";
-import { clearSoundFont } from "./engine_methods/soundfont_management/clear_sound_font.js";
+import { clearEmbeddedBank, setEmbeddedSoundFont } from "./engine_methods/soundfont_management/embedded_sound_bank.js";
 import { updatePresetList } from "./engine_methods/soundfont_management/update_preset_list.js";
-import { getPreset } from "./engine_methods/soundfont_management/get_preset.js";
 import { transposeAllChannels } from "./engine_methods/tuning_control/transpose_all_channels.js";
 import { setMasterTuning } from "./engine_methods/tuning_control/set_master_tuning.js";
 import { applySynthesizerSnapshot } from "./snapshot/apply_synthesizer_snapshot.js";
@@ -26,6 +24,7 @@ import { IndexedByteArray } from "../../utils/indexed_array.js";
 import { interpolationTypes } from "./engine_components/enums.js";
 import { DEFAULT_SYNTH_OPTIONS } from "./synth_processor_options.js";
 import { fillWithDefaults } from "../../utils/fill_with_defaults.js";
+import { isSystemXG } from "../../utils/xg_hacks.js";
 
 
 /**
@@ -169,7 +168,7 @@ class SpessaSynthProcessor
     /**
      * Cached voices for all presets for this synthesizer.
      * Nesting goes like this:
-     * this.cachedVoices[bankNumber][programNumber][midiNote][velocity] = a list of Voices for that.
+     * this.cachedVoices[bankNumber][programNumber][midiNote][velocity] = a list of voices for that.
      * @type {Voice[][][][][]}
      */
     cachedVoices = [];
@@ -211,7 +210,6 @@ class SpessaSynthProcessor
      */
     soundfontBankOffset = 0;
     
-    
     /**
      * The volume gain, set by user
      * @type {number}
@@ -270,12 +268,6 @@ class SpessaSynthProcessor
      */
     keyModifierManager = new KeyModifierManager();
     
-    /**
-     * Overrides the main soundfont (embedded, for example)
-     * @type {BasicSoundBank}
-     */
-    overrideSoundfont = undefined;
-    
     /**
      * contains all the channels with their voices on the processor size
      * @type {MidiAudioChannel[]}
@@ -299,16 +291,12 @@ class SpessaSynthProcessor
      */
     defaultPreset;
     
-    defaultPresetUsesOverride = false;
-    
     /**
      * Synth's default (reset) drum preset
      * @type {BasicPreset}
      */
     drumPreset;
     
-    defaultDrumsUsesOverride = false;
-    
     /**
      * Controls if the processor is fully initialized
      * @type {Promise<boolean>}
@@ -431,10 +419,8 @@ class SpessaSynthProcessor
         const sys = this.system;
         this.system = "xg";
         this.defaultPreset = this.getPreset(0, 0);
-        this.defaultPresetUsesOverride = this.overrideSoundfont?.presets?.indexOf(this.defaultPreset) >= 0;
         this.system = sys;
         this.drumPreset = this.getPreset(128, 0);
-        this.defaultDrumsUsesOverride = this.overrideSoundfont?.presets?.indexOf(this.drumPreset) >= 0;
     }
     
     /**
@@ -750,11 +736,22 @@ class SpessaSynthProcessor
     {
         this.cachedVoices = [];
     }
+    
+    /**
+     * @param program {number}
+     * @param bank {number}
+     * @returns {BasicPreset}
+     */
+    getPreset(bank, program)
+    {
+        return this.soundfontManager.getPreset(bank, program, isSystemXG(this.system)).preset;
+    }
 }
 
 // include other methods
 // voice related
 SpessaSynthProcessor.prototype.voiceKilling = voiceKilling;
+SpessaSynthProcessor.prototype.getVoicesForPreset = getVoicesForPreset;
 SpessaSynthProcessor.prototype.getVoices = getVoices;
 
 // system-exclusive related
@@ -773,8 +770,7 @@ SpessaSynthProcessor.prototype.transposeAllChannels = transposeAllChannels;
 SpessaSynthProcessor.prototype.setMasterTuning = setMasterTuning;
 
 // program related
-SpessaSynthProcessor.prototype.getPreset = getPreset;
-SpessaSynthProcessor.prototype.clearSoundFont = clearSoundFont;
+SpessaSynthProcessor.prototype.clearEmbeddedBank = clearEmbeddedBank;
 SpessaSynthProcessor.prototype.setEmbeddedSoundFont = setEmbeddedSoundFont;
 SpessaSynthProcessor.prototype.updatePresetList = updatePresetList;
 

package/src/synthetizer/synth_constants.js

@@ -19,4 +19,6 @@ export const MIDI_CHANNEL_COUNT = 16;
  */
 export const DEFAULT_SYNTH_MODE = "gs";
 
-export const ALL_CHANNELS_OR_DIFFERENT_ACTION = -1;
+export const ALL_CHANNELS_OR_DIFFERENT_ACTION = -1;
+
+export const EMBEDDED_SOUND_BANK_ID = `SPESSASYNTH_EMBEDDED_BANK_${Math.random()}`;

package/src/synthetizer/audio_engine/engine_methods/soundfont_management/clear_sound_font.js

@@ -1,32 +0,0 @@
-/**
- * @this {SpessaSynthProcessor}
- * @param sendPresets {boolean}
- * @param clearOverride {boolean}
- */
-export function clearSoundFont(sendPresets = true, clearOverride = true)
-{
-    this.stopAllChannels(true);
-    if (clearOverride)
-    {
-        delete this.overrideSoundfont;
-        this.overrideSoundfont = undefined;
-    }
-    this.getDefaultPresets();
-    this.clearCache();
-    
-    if (sendPresets)
-    {
-        this.updatePresetList();
-    }
-    
-    for (let i = 0; i < this.midiAudioChannels.length; i++)
-    {
-        const channelObject = this.midiAudioChannels[i];
-        if (!clearOverride || (clearOverride && channelObject.presetUsesOverride))
-        {
-            channelObject.setPresetLock(false);
-        }
-        channelObject.programChange(channelObject.preset.program);
-    }
-    
-}

package/src/synthetizer/audio_engine/engine_methods/soundfont_management/set_embedded_sound_font.js

@@ -1,33 +0,0 @@
-import { loadSoundFont } from "../../../../soundfont/load_soundfont.js";
-import { SpessaSynthInfo } from "../../../../utils/loggin.js";
-import { consoleColors } from "../../../../utils/other.js";
-
-/**
- * Sets the embedded (RMI soundfont)
- * @param font {ArrayBuffer}
- * @param offset {number}
- * @this {SpessaSynthProcessor}
- */
-export function setEmbeddedSoundFont(font, offset)
-{
-    // set offset
-    this.soundfontBankOffset = offset;
-    this.clearSoundFont(false, true);
-    this.overrideSoundfont = loadSoundFont(font);
-    this.updatePresetList();
-    this.getDefaultPresets();
-    this.midiAudioChannels.forEach(c =>
-        c.programChange(c.preset.program)
-    );
-    // preload all samples
-    this.overrideSoundfont.samples.forEach(s => s.getAudioData());
-    
-    
-    // apply snapshot again if applicable
-    if (this._snapshot !== undefined)
-    {
-        this.applySynthesizerSnapshot(this._snapshot);
-        this.resetAllControllers();
-    }
-    SpessaSynthInfo("%cSpessaSynth is ready!", consoleColors.recognized);
-}