spessasynth_core 3.26.5 → 3.26.6

package/package.json

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

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
     }
     
     /**

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++)

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

@@ -7,7 +7,11 @@ 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";
 
 const EXCLUSIVE_CUTOFF_TIME = -2320;
@@ -385,7 +389,7 @@ export function getVoicesForPreset(preset, bank, program, midiNote, velocity, re
             }
             
             // 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++)
             {

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

@@ -150,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/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/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)