spessasynth_core 3.26.4 → 3.26.6

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

@@ -7,9 +7,12 @@ import { SpessaSynthWarn } from "../../../utils/loggin.js";
 import { LowpassFilter } from "./lowpass_filter.js";
 import { VolumeEnvelope } from "./volume_envelope.js";
 import { ModulationEnvelope } from "./modulation_envelope.js";
-import { addAndClampGenerator, generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
+import {
+    addAndClampGenerator,
+    GENERATORS_AMOUNT,
+    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 +165,6 @@ class Voice
      */
     isInRelease = false;
     
-    /**
-     * MIDI channel number.
-     * @type {number}
-     */
-    channelNumber = 0;
-    
     /**
      * Velocity of the note.
      * @type {number}
@@ -272,7 +269,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 +280,6 @@ class Voice
         audioSample,
         midiNote,
         velocity,
-        channel,
         currentTime,
         targetKey,
         realKey,
@@ -301,7 +296,6 @@ class Voice
         
         this.velocity = velocity;
         this.midiNote = midiNote;
-        this.channelNumber = channel;
         this.startTime = currentTime;
         this.targetKey = targetKey;
         this.realKey = realKey;
@@ -333,7 +327,6 @@ class Voice
             sample,
             voice.midiNote,
             voice.velocity,
-            voice.channelNumber,
             currentTime,
             voice.targetKey,
             realKey,
@@ -372,53 +365,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)
@@ -428,7 +389,7 @@ export function getVoices(channel,
             }
             
             // create the generator list
-            const generators = new Int16Array(60);
+            const generators = new Int16Array(GENERATORS_AMOUNT);
             // apply and sum the gens
             for (let i = 0; i < 60; i++)
             {
@@ -501,7 +462,6 @@ export function getVoices(channel,
                     audioSample,
                     midiNote,
                     velocity,
-                    channel,
                     this.currentSynthTime,
                     targetKey,
                     realKey,
@@ -515,4 +475,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++)
@@ -154,12 +150,13 @@ export function resetControllers()
     this.holdPedal = false;
     this.randomPan = false;
     
+    this.sysExModulators.resetModulators();
+    
     // reset custom controllers
     // special case: transpose does not get affected
     const transpose = this.customControllers[customControllers.channelTransposeFine];
     this.customControllers.set(customResetArray);
     this.setCustomController(customControllers.channelTransposeFine, transpose);
-    
     this.resetParameters();
     
 }

package/src/synthetizer/audio_engine/engine_methods/data_entry/data_entry_coarse.js

@@ -16,23 +16,29 @@ const registeredParameterTypes = {
     resetParameters: 0x3FFF
 };
 
+/**
+ * @enum {number}
+ */
+const nonRegisteredGSMSB = {
+    partParameter: 0x01
+};
+
 /**
  * https://cdn.roland.com/assets/media/pdf/SC-88PRO_OM.pdf
  * http://hummer.stanford.edu/sig/doc/classes/MidiOutput/rpn.html
  * @enum {number}
  */
-const nonRegisteredParameterNumbers = {
-    partParameter: 0x01,
-    
+const nonRegisteredGSLSB = {
     vibratoRate: 0x08,
     vibratoDepth: 0x09,
     vibratoDelay: 0x0A,
     
-    EGAttackTime: 0x64,
-    EGReleaseTime: 0x66,
-    
     TVFFilterCutoff: 0x20,
-    drumReverb: 0x1D
+    TVFFilterResonance: 0x21,
+    
+    EGAttackTime: 0x63,
+    EGReleaseTime: 0x66
+    
 };
 
 
@@ -111,7 +117,7 @@ export function dataEntryCoarse(dataValue)
                     break;
                 
                 // part parameters: vibrato, cutoff
-                case nonRegisteredParameterNumbers.partParameter:
+                case nonRegisteredGSMSB.partParameter:
                     switch (NRPNFine)
                     {
                         default:
@@ -133,7 +139,7 @@ export function dataEntryCoarse(dataValue)
                             break;
                         
                         // vibrato rate
-                        case nonRegisteredParameterNumbers.vibratoRate:
+                        case nonRegisteredGSLSB.vibratoRate:
                             if (dataValue === 64)
                             {
                                 return;
@@ -144,7 +150,7 @@ export function dataEntryCoarse(dataValue)
                             break;
                         
                         // vibrato depth
-                        case nonRegisteredParameterNumbers.vibratoDepth:
+                        case nonRegisteredGSLSB.vibratoDepth:
                             if (dataValue === 64)
                             {
                                 return;
@@ -155,7 +161,7 @@ export function dataEntryCoarse(dataValue)
                             break;
                         
                         // vibrato delay
-                        case nonRegisteredParameterNumbers.vibratoDelay:
+                        case nonRegisteredGSLSB.vibratoDelay:
                             if (dataValue === 64)
                             {
                                 return;
@@ -166,34 +172,27 @@ export function dataEntryCoarse(dataValue)
                             break;
                         
                         // filter cutoff
-                        case nonRegisteredParameterNumbers.TVFFilterCutoff:
+                        case nonRegisteredGSLSB.TVFFilterCutoff:
                             // affect the "brightness" controller as we have a default modulator that controls it
                             this.controllerChange(midiControllers.brightness, dataValue);
                             coolInfo("Filter cutoff", dataValue.toString(), "");
                             break;
                         
                         // attack time
-                        case nonRegisteredParameterNumbers.EGAttackTime:
+                        case nonRegisteredGSLSB.EGAttackTime:
                             // affect the "attack time" controller as we have a default modulator that controls it
                             this.controllerChange(midiControllers.attackTime, dataValue);
                             coolInfo("EG attack time", dataValue.toString(), "");
                             break;
                         
                         // release time
-                        case nonRegisteredParameterNumbers.EGReleaseTime:
+                        case nonRegisteredGSLSB.EGReleaseTime:
                             // affect the "release time" controller as we have a default modulator that controls it
                             this.controllerChange(midiControllers.releaseTime, dataValue);
                             coolInfo("EG release time", dataValue.toString(), "");
                             break;
                     }
                     break;
-                
-                // drum reverb
-                case nonRegisteredParameterNumbers.drumReverb:
-                    const reverb = dataValue;
-                    this.controllerChange(midiControllers.reverbDepth, reverb);
-                    coolInfo("GS Drum reverb", reverb.toString(), "percent");
-                    break;
             }
             break;
         

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

@@ -2,6 +2,8 @@ import { computeModulators } from "../engine_components/compute_modulator.js";
 import { generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
 import { midiControllers } from "../../../midi/midi_message.js";
 import { portamentoTimeToSeconds } from "./portamento_time.js";
+import { customControllers } from "../engine_components/controller_tables.js";
+import { Modulator } from "../../../soundfont/basic_soundfont/modulator.js";
 
 /**
  * sends a "MIDI Note on message"
@@ -27,8 +29,8 @@ export function noteOn(midiNote, velocity)
         return;
     }
     
-    const realKey = midiNote + this.channelTransposeKeyShift;
-    let sentMidiNote = realKey;
+    const realKey = midiNote + this.channelTransposeKeyShift + this.customControllers[customControllers.channelKeyShift];
+    let internalMidiNote = realKey;
     
     if (realKey > 127 || realKey < 0)
     {
@@ -38,7 +40,7 @@ export function noteOn(midiNote, velocity)
     const tune = this.synth.tunings[program]?.[realKey]?.midiNote;
     if (tune >= 0)
     {
-        sentMidiNote = tune;
+        internalMidiNote = tune;
     }
     
     // velocity override
@@ -66,7 +68,7 @@ export function noteOn(midiNote, velocity)
     const currentFromKey = control >> 7;
     if (
         !this.drumChannel && // no portamento on drum channel
-        currentFromKey !== sentMidiNote && // if the same note, there's no portamento
+        currentFromKey !== internalMidiNote && // if the same note, there's no portamento
         this.midiControllers[midiControllers.portamentoOnOff] >= 8192 && // (64 << 7)
         portamentoTime > 0 // 0 duration is no portamento
     )
@@ -74,18 +76,17 @@ export function noteOn(midiNote, velocity)
         // a value of one means the initial portamento
         if (control !== 1)
         {
-            const diff = Math.abs(sentMidiNote - currentFromKey);
+            const diff = Math.abs(internalMidiNote - currentFromKey);
             portamentoDuration = portamentoTimeToSeconds(portamentoTime, diff);
             portamentoFromKey = currentFromKey;
         }
         // set portamento control to previous value
-        this.controllerChange(midiControllers.portamentoControl, sentMidiNote);
+        this.controllerChange(midiControllers.portamentoControl, internalMidiNote);
     }
-    
     // get voices
     const voices = this.synth.getVoices(
         this.channelNumber,
-        sentMidiNote,
+        internalMidiNote,
         velocity,
         realKey
     );
@@ -98,6 +99,9 @@ export function noteOn(midiNote, velocity)
         panOverride = Math.round(Math.random() * 1000 - 500);
     }
     
+    // dynamic modulators (sysEx)
+    const dynamicModulators = this.sysExModulators.getModulators();
+    
     // add voices
     const channelVoices = this.voices;
     voices.forEach(voice =>
@@ -112,6 +116,22 @@ export function noteOn(midiNote, velocity)
         // apply gain override
         voice.gain = voiceGain;
         
+        dynamicModulators.forEach(mod =>
+        {
+            const existingModIndex = voice.modulators.findIndex(voiceMod => Modulator.isIdentical(voiceMod, mod));
+            
+            // replace or add
+            if (existingModIndex !== -1)
+            {
+                voice.modulators[existingModIndex] = Modulator.copy(mod);
+            }
+            else
+            {
+                voice.modulators.push(Modulator.copy(mod));
+            }
+        });
+        
+        
         // apply exclusive class
         const exclusive = voice.exclusiveClass;
         if (exclusive !== 0)

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/render_voice.js

@@ -88,26 +88,33 @@ export function renderVoice(
     // calculate tuning by key using soundfont's scale tuning
     cents += (targetKey - voice.sample.rootKey) * voice.modulatedGenerators[generatorTypes.scaleTuning];
     
+    // low pass excursion with LFO and mod envelope
+    let lowpassExcursion = 0;
+    let volumeExcursionCentibels = 0;
+    
     // vibrato LFO
-    const vibratoDepth = voice.modulatedGenerators[generatorTypes.vibLfoToPitch];
-    if (vibratoDepth !== 0)
+    const vibPitchDepth = voice.modulatedGenerators[generatorTypes.vibLfoToPitch];
+    const vibVolDepth = voice.modulatedGenerators[generatorTypes.vibLfoToVolume];
+    const vibFilterDepth = voice.modulatedGenerators[generatorTypes.vibLfoToFilterFc];
+    if (vibPitchDepth !== 0 || vibVolDepth !== 0 || vibFilterDepth !== 0)
     {
         // calculate start time and lfo value
         const vibStart = voice.startTime + timecentsToSeconds(voice.modulatedGenerators[generatorTypes.delayVibLFO]);
         const vibFreqHz = absCentsToHz(voice.modulatedGenerators[generatorTypes.freqVibLFO]);
-        const lfoVal = getLFOValue(vibStart, vibFreqHz, timeNow);
+        const vibLfoValue = getLFOValue(vibStart, vibFreqHz, timeNow);
         // use modulation multiplier (RPN modulation depth)
-        cents += lfoVal * (vibratoDepth * this.customControllers[customControllers.modulationMultiplier]);
+        cents += vibLfoValue * (vibPitchDepth * this.customControllers[customControllers.modulationMultiplier]);
+        // vol env volume offset
+        // negate the lfo value because audigy starts with increase rather than decrease
+        volumeExcursionCentibels += -vibLfoValue * vibVolDepth;
+        // low pass frequency
+        lowpassExcursion += vibLfoValue * vibFilterDepth;
     }
     
-    // low pass excursion with LFO and mod envelope
-    let lowpassExcursion = 0;
-    
     // mod LFO
     const modPitchDepth = voice.modulatedGenerators[generatorTypes.modLfoToPitch];
     const modVolDepth = voice.modulatedGenerators[generatorTypes.modLfoToVolume];
     const modFilterDepth = voice.modulatedGenerators[generatorTypes.modLfoToFilterFc];
-    let modLfoCentibels = 0;
     // don't compute mod lfo unless necessary
     if (modPitchDepth !== 0 || modFilterDepth !== 0 || modVolDepth !== 0)
     {
@@ -117,9 +124,9 @@ export function renderVoice(
         const modLfoValue = getLFOValue(modStart, modFreqHz, timeNow);
         // use modulation multiplier (RPN modulation depth)
         cents += modLfoValue * (modPitchDepth * this.customControllers[customControllers.modulationMultiplier]);
-        // vole nv volume offset
+        // vol env volume offset
         // negate the lfo value because audigy starts with increase rather than decrease
-        modLfoCentibels = -modLfoValue * modVolDepth;
+        volumeExcursionCentibels += -modLfoValue * modVolDepth;
         // low pass frequency
         lowpassExcursion += modLfoValue * modFilterDepth;
     }
@@ -184,7 +191,7 @@ export function renderVoice(
     LowpassFilter.apply(voice, bufferOut, lowpassExcursion, this.synth.filterSmoothingFactor);
     
     // vol env
-    VolumeEnvelope.apply(voice, bufferOut, modLfoCentibels, this.synth.volumeEnvelopeSmoothingFactor);
+    VolumeEnvelope.apply(voice, bufferOut, volumeExcursionCentibels, this.synth.volumeEnvelopeSmoothingFactor);
     
     this.panVoice(
         voice,

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/engine_methods/stopping_notes/kill_note.js

@@ -1,4 +1,5 @@
 import { generatorTypes } from "../../../../soundfont/basic_soundfont/generator.js";
+import { customControllers } from "../../engine_components/controller_tables.js";
 
 /**
  * Stops a note nearly instantly
@@ -8,6 +9,8 @@ import { generatorTypes } from "../../../../soundfont/basic_soundfont/generator.
  */
 export function killNote(midiNote, releaseTime = -12000)
 {
+    midiNote += this.customControllers[customControllers.channelKeyShift];
+    
     this.voices.forEach(v =>
     {
         if (v.realKey !== midiNote)

package/src/synthetizer/audio_engine/engine_methods/stopping_notes/note_off.js

@@ -1,4 +1,5 @@
 import { SpessaSynthWarn } from "../../../../utils/loggin.js";
+import { customControllers } from "../../engine_components/controller_tables.js";
 
 /**
  * Release a note
@@ -13,7 +14,7 @@ export function noteOff(midiNote)
         return;
     }
     
-    let realKey = midiNote + this.channelTransposeKeyShift;
+    let realKey = midiNote + this.channelTransposeKeyShift + this.customControllers[customControllers.channelKeyShift];
     
     // if high performance mode, kill notes instead of stopping them
     if (this.synth.highPerformanceMode)