spessasynth_core 3.26.4 → 3.26.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_core",
-  "version": "3.26.4",
+  "version": "3.26.6",
   "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/soundfont/basic_soundfont/generator.js

@@ -63,8 +63,14 @@ export const generatorTypes = {
     exclusiveClass: 57,                 // sample - = cut = choke group
     overridingRootKey: 58,              // sample - can override the sample's original pitch
     unused5: 59,                        // unused
-    endOper: 60                         // end marker
+    endOper: 60,                        // end marker
+    
+    // additional generators that are used in system exclusives and will not be saved
+    vibLfoToVolume: 61,
+    vibLfoToFilterFc: 62
 };
+export const GENERATORS_AMOUNT = Object.keys(generatorTypes).length;
+
 /**
  * @type {{min: number, max: number, def: number}[]}
  */
@@ -85,11 +91,13 @@ generatorLimits[generatorTypes.modEnvToPitch] = { min: -12000, max: 12000, def:
 generatorLimits[generatorTypes.initialFilterFc] = { min: 1500, max: 13500, def: 13500 };
 generatorLimits[generatorTypes.initialFilterQ] = { min: 0, max: 960, def: 0 };
 generatorLimits[generatorTypes.modLfoToFilterFc] = { min: -12000, max: 12000, def: 0 };
+generatorLimits[generatorTypes.vibLfoToFilterFc] = { min: -12000, max: 12000, def: 0 }; // NON-STANDARD
 generatorLimits[generatorTypes.modEnvToFilterFc] = { min: -12000, max: 12000, def: 0 };
 
 generatorLimits[generatorTypes.endAddrsCoarseOffset] = { min: -32768, max: 32768, def: 0 };
 
 generatorLimits[generatorTypes.modLfoToVolume] = { min: -960, max: 960, def: 0 };
+generatorLimits[generatorTypes.vibLfoToVolume] = { min: -960, max: 960, def: 0 }; // NON-STANDARD
 
 // effects, pan
 generatorLimits[generatorTypes.chorusEffectsSend] = { min: 0, max: 1000, def: 0 };

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

@@ -57,12 +57,13 @@ setResetValue(NON_CC_INDEX_OFFSET + modulatorSources.pitchWheelRange, 2);
  * @enum {number}
  */
 export const customControllers = {
-    channelTuning: 0,           // cents, RPN for fine tuning
-    channelTransposeFine: 1,    // cents, only the decimal tuning, (e.g., transpose is 4.5,
+    channelTuning: 0,              // cents, RPN for fine tuning
+    channelTransposeFine: 1,       // cents, only the decimal tuning, (e.g., transpose is 4.5,
     // then shift by 4 keys + tune by 50 cents)
-    modulationMultiplier: 2,    // cents, set by modulation depth RPN
-    masterTuning: 3,            // cents, set by system exclusive
-    channelTuningSemitones: 4   // semitones, for RPN coarse tuning
+    modulationMultiplier: 2,       // cents, set by modulation depth RPN
+    masterTuning: 3,               // cents, set by system exclusive
+    channelTuningSemitones: 4,     // semitones, for RPN coarse tuning
+    channelKeyShift: 5            // key shift: for system exclusive
 };
 export const CUSTOM_CONTROLLER_TABLE_SIZE = Object.keys(customControllers).length;
 export const customResetArray = new Float32Array(CUSTOM_CONTROLLER_TABLE_SIZE);

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

@@ -0,0 +1,95 @@
+import { getModSourceEnum, Modulator, modulatorCurveTypes } from "../../../soundfont/basic_soundfont/modulator.js";
+import { NON_CC_INDEX_OFFSET } from "./controller_tables.js";
+
+/**
+ * A class for dynamic modulators
+ * that are assigned for more complex system exclusive messages
+ */
+export class DynamicModulatorSystem
+{
+    /**
+     * the current dynamic modulator list
+     * @type {{mod: Modulator, id: string}[]}
+     */
+    modulatorList = [];
+    
+    resetModulators()
+    {
+        this.modulatorList = [];
+    }
+    
+    /**
+     * @returns {Modulator[]}
+     */
+    getModulators()
+    {
+        return this.modulatorList.map(m => m.mod);
+    }
+    
+    /**
+     * @param source {number}
+     * @param destination {generatorTypes}
+     * @param isBipolar {boolean}
+     * @param isNegative {boolean}
+     */
+    _getModulatorId(source, destination, isBipolar, isNegative)
+    {
+        return `${source}-${destination}-${isBipolar}-${isNegative}`;
+    }
+    
+    /**
+     * @param id {string}
+     * @private
+     */
+    _deleteModulator(id)
+    {
+        this.modulatorList = this.modulatorList.filter(m => m.id !== id);
+    }
+    
+    /**
+     * @param source {number} like in midiControllers: values below NON_CC_INDEX_OFFSET are CCs,
+     * above are regular modulator sources
+     * @param destination {generatorTypes}
+     * @param amount {number}
+     * @param isBipolar {boolean}
+     * @param isNegative {boolean}
+     */
+    setModulator(source, destination, amount, isBipolar = false, isNegative = false)
+    {
+        const id = this._getModulatorId(source, destination, isBipolar, isNegative);
+        if (amount === 0)
+        {
+            this._deleteModulator(id);
+        }
+        const mod = this.modulatorList.find(m => m.id === id);
+        if (mod)
+        {
+            mod.mod.transformAmount = amount;
+        }
+        else
+        {
+            let srcNum, isCC;
+            if (source >= NON_CC_INDEX_OFFSET)
+            {
+                srcNum = source - NON_CC_INDEX_OFFSET;
+                isCC = false;
+            }
+            else
+            {
+                srcNum = source;
+                isCC = true;
+            }
+            const modulator = new Modulator(
+                getModSourceEnum(modulatorCurveTypes.linear, isBipolar, 0, isCC, srcNum),
+                0x0, // linear no controller
+                destination,
+                amount,
+                0
+            );
+            this.modulatorList.push({
+                mod: modulator,
+                id: id
+            });
+        }
+    }
+}

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

@@ -31,6 +31,7 @@ import { programChange } from "../engine_methods/program_change.js";
 import { chooseBank, isSystemXG, parseBankSelect } from "../../../utils/xg_hacks.js";
 import { DEFAULT_PERCUSSION } from "../../synth_constants.js";
 import { modulatorSources } from "../../../soundfont/basic_soundfont/modulator.js";
+import { DynamicModulatorSystem } from "./dynamic_modulator_system.js";
 
 /**
  * This class represents a single MIDI Channel within the synthesizer.
@@ -81,6 +82,12 @@ class MidiAudioChannel
      */
     channelTuningCents = 0;
     
+    /**
+     * A system for dynamic modulator assignment for system exclusives
+     * @type {DynamicModulatorSystem}
+     */
+    sysExModulators = new DynamicModulatorSystem();
+    
     /**
      * Indicates whether the sustain (hold) pedal is active.
      * @type {boolean}
@@ -147,12 +154,6 @@ class MidiAudioChannel
      */
     lockedSystem = "gs";
     
-    /**
-     * Indicates whether the channel uses a preset from the override soundfont.
-     * @type {boolean}
-     */
-    presetUsesOverride = false;
-    
     /**
      * Indicates whether the GS NRPN parameters are enabled for this channel.
      * @type {boolean}
@@ -229,10 +230,10 @@ class MidiAudioChannel
     updateChannelTuning()
     {
         this.channelTuningCents =
-            this.customControllers[customControllers.channelTuning]                     // RPN channel fine tuning
-            + this.customControllers[customControllers.channelTransposeFine]            // user tuning (transpose)
-            + this.customControllers[customControllers.masterTuning]                    // master tuning, set by sysEx
-            + (this.customControllers[customControllers.channelTuningSemitones] * 100); // RPN channel coarse tuning
+            this.customControllers[customControllers.channelTuning]                         // RPN channel fine tuning
+            + this.customControllers[customControllers.channelTransposeFine]                // user tuning (transpose)
+            + this.customControllers[customControllers.masterTuning]                        // master tuning, set by sysEx
+            + (this.customControllers[customControllers.channelTuningSemitones] * 100);      // RPN channel coarse tuning
     }
     
     /**
@@ -361,7 +362,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/stereo_panner.js

@@ -78,7 +78,7 @@ export function panVoice(voice,
         if (reverbSend > 0)
         {
             // reverb is mono so we need to multiply by gain
-            const reverbGain = this.synth.reverbGain * gain * (reverbSend / REVERB_DIVIDER);
+            const reverbGain = this.synth.reverbGain * this.synth.reverbSend * gain * (reverbSend / REVERB_DIVIDER);
             for (let i = 0; i < inputBuffer.length; i++)
             {
                 reverbLeft[i] += reverbGain * inputBuffer[i];
@@ -91,7 +91,7 @@ export function panVoice(voice,
         if (chorusSend > 0)
         {
             // chorus is stereo so we do not need to
-            const chorusGain = this.synth.chorusGain * chorusSend / CHORUS_DIVIDER;
+            const chorusGain = this.synth.chorusGain * this.synth.chorusSend * (chorusSend / CHORUS_DIVIDER);
             const chorusLeftGain = gainLeft * chorusGain;
             const chorusRightGain = gainRight * chorusGain;
             for (let i = 0; i < inputBuffer.length; i++)