spessasynth_core 3.26.17 → 3.26.19

package/src/soundfont/dls/dls_soundfont.js

@@ -1,4 +1,4 @@
-import { BasicSoundBank } from "../basic_soundfont/basic_soundfont.js";
+import { BasicSoundBank } from "../basic_soundfont/basic_soundbank.js";
 import { IndexedByteArray } from "../../utils/indexed_array.js";
 import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo } from "../../utils/loggin.js";
 import { consoleColors } from "../../utils/other.js";
@@ -114,8 +114,7 @@ class DLSSoundFont extends BasicSoundBank
         this.readDLSInstrumentList(instrumentListChunk);
         
         // sort presets
-        this.presets.sort((a, b) => (a.program - b.program) + (a.bank - b.bank));
-        this._parseInternal();
+        this.flush();
         SpessaSynthInfo(
             `%cParsing finished! %c"${this.soundFontInfo["INAM"] || "UNNAMED"}"%c has %c${this.presets.length} %cpresets,
         %c${this.instruments.length}%c instruments and %c${this.samples.length}%c samples.`,

package/src/soundfont/dls/dls_sources.js

@@ -1,5 +1,6 @@
-import { Modulator } from "../basic_soundfont/modulator.js";
-import { generatorTypes } from "../basic_soundfont/generator.js";
+import { DecodedModulator } from "../basic_soundfont/modulator.js";
+
+import { generatorTypes } from "../basic_soundfont/generator_types.js";
 
 /**
  * @enum {number}
@@ -29,7 +30,7 @@ export const DLSSources = {
     coarseTune: 0x102
 };
 
-export const DEFAULT_DLS_REVERB = new Modulator(
+export const DEFAULT_DLS_REVERB = new DecodedModulator(
     0x00DB,
     0x0,
     generatorTypes.reverbEffectsSend,
@@ -37,7 +38,7 @@ export const DEFAULT_DLS_REVERB = new Modulator(
     0
 );
 
-export const DEFAULT_DLS_CHORUS = new Modulator(
+export const DEFAULT_DLS_CHORUS = new DecodedModulator(
     0x00DD,
     0x0,
     generatorTypes.chorusEffectsSend,
@@ -45,7 +46,7 @@ export const DEFAULT_DLS_CHORUS = new Modulator(
     0
 );
 
-export const DLS_1_NO_VIBRATO_MOD = new Modulator(
+export const DLS_1_NO_VIBRATO_MOD = new DecodedModulator(
     0x0081,
     0x0,
     generatorTypes.vibLfoToPitch,
@@ -53,7 +54,7 @@ export const DLS_1_NO_VIBRATO_MOD = new Modulator(
     0
 );
 
-export const DLS_1_NO_VIBRATO_PRESSURE = new Modulator(
+export const DLS_1_NO_VIBRATO_PRESSURE = new DecodedModulator(
     0x000D,
     0x0,
     generatorTypes.vibLfoToPitch,

package/src/soundfont/dls/dls_zone.js

@@ -1,5 +1,6 @@
-import { BasicInstrumentZone } from "../basic_soundfont/basic_zones.js";
-import { Generator, generatorTypes } from "../basic_soundfont/generator.js";
+import { Generator } from "../basic_soundfont/generator.js";
+import { generatorTypes } from "../basic_soundfont/generator_types.js";
+import { BasicInstrumentZone } from "../basic_soundfont/basic_instrument_zone.js";
 
 export class DLSZone extends BasicInstrumentZone
 {
@@ -12,7 +13,6 @@ export class DLSZone extends BasicInstrumentZone
         super();
         this.keyRange = keyRange;
         this.velRange = velRange;
-        this.isGlobal = true;
     }
     
     /**
@@ -36,22 +36,21 @@ export class DLSZone extends BasicInstrumentZone
     {
         if (loopingMode !== 0)
         {
-            this.generators.push(new Generator(generatorTypes.sampleModes, loopingMode));
+            this.addGenerators(new Generator(generatorTypes.sampleModes, loopingMode));
         }
-        this.generators.push(new Generator(generatorTypes.initialAttenuation, attenuationCb));
-        this.isGlobal = false;
+        this.addGenerators(new Generator(generatorTypes.initialAttenuation, attenuationCb));
         
         // correct tuning if needed
         samplePitchCorrection -= sample.samplePitchCorrection;
         const coarseTune = Math.trunc(samplePitchCorrection / 100);
         if (coarseTune !== 0)
         {
-            this.generators.push(new Generator(generatorTypes.coarseTune, coarseTune));
+            this.addGenerators(new Generator(generatorTypes.coarseTune, coarseTune));
         }
         const fineTune = samplePitchCorrection - (coarseTune * 100);
         if (fineTune !== 0)
         {
-            this.generators.push(new Generator(generatorTypes.fineTune, fineTune));
+            this.addGenerators(new Generator(generatorTypes.fineTune, fineTune));
         }
         
         // correct loop if needed
@@ -62,34 +61,32 @@ export class DLSZone extends BasicInstrumentZone
             if (diffStart !== 0)
             {
                 const fine = diffStart % 32768;
-                this.generators.push(new Generator(generatorTypes.startloopAddrsOffset, fine));
+                this.addGenerators(new Generator(generatorTypes.startloopAddrsOffset, fine));
                 // coarse generator uses 32768 samples per step
                 const coarse = Math.trunc(diffStart / 32768);
                 if (coarse !== 0)
                 {
-                    this.generators.push(new Generator(generatorTypes.startloopAddrsCoarseOffset, coarse));
+                    this.addGenerators(new Generator(generatorTypes.startloopAddrsCoarseOffset, coarse));
                 }
             }
             if (diffEnd !== 0)
             {
                 const fine = diffEnd % 32768;
-                this.generators.push(new Generator(generatorTypes.endloopAddrsOffset, fine));
+                this.addGenerators(new Generator(generatorTypes.endloopAddrsOffset, fine));
                 // coarse generator uses 32768 samples per step
                 const coarse = Math.trunc(diffEnd / 32768);
                 if (coarse !== 0)
                 {
-                    this.generators.push(new Generator(generatorTypes.endloopAddrsCoarseOffset, coarse));
+                    this.addGenerators(new Generator(generatorTypes.endloopAddrsCoarseOffset, coarse));
                 }
             }
         }
         // correct the key if needed
         if (sampleKey !== sample.samplePitch)
         {
-            this.generators.push(new Generator(generatorTypes.overridingRootKey, sampleKey));
+            this.addGenerators(new Generator(generatorTypes.overridingRootKey, sampleKey));
         }
         // add sample ID
-        this.generators.push(new Generator(generatorTypes.sampleID, sampleID));
-        this.sample = sample;
-        sample.useCount++;
+        this.setSample(sample);
     }
 }

package/src/soundfont/dls/read_articulation.js

@@ -4,8 +4,9 @@ import { DLS_1_NO_VIBRATO_MOD, DLS_1_NO_VIBRATO_PRESSURE, DLSSources } from "./d
 import { getSF2ModulatorFromArticulator } from "./articulator_converter.js";
 import { SpessaSynthInfo, SpessaSynthWarn } from "../../utils/loggin.js";
 import { consoleColors } from "../../utils/other.js";
-import { Generator, generatorTypes } from "../basic_soundfont/generator.js";
+import { Generator } from "../basic_soundfont/generator.js";
 import { Modulator } from "../basic_soundfont/modulator.js";
+import { generatorTypes } from "../basic_soundfont/generator_types.js";
 
 
 /**

package/src/soundfont/dls/read_instrument.js

@@ -3,11 +3,10 @@ import { readLittleEndian } from "../../utils/byte_functions/little_endian.js";
 import { DLSPreset } from "./dls_preset.js";
 import { findRIFFListType, readRIFFChunk } from "../basic_soundfont/riff_chunk.js";
 import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd } from "../../utils/loggin.js";
-import { BasicInstrumentZone } from "../basic_soundfont/basic_zones.js";
 import { consoleColors } from "../../utils/other.js";
-import { generatorLimits, generatorTypes } from "../basic_soundfont/generator.js";
 import { Modulator } from "../basic_soundfont/modulator.js";
 import { DEFAULT_DLS_CHORUS, DEFAULT_DLS_REVERB } from "./dls_sources.js";
+import { generatorLimits, generatorTypes } from "../basic_soundfont/generator_types.js";
 
 /**
  * @this {DLSSoundFont}
@@ -70,8 +69,7 @@ export function readDLSInstrument(chunk)
     }
     
     // global articulation: essentially global zone
-    const globalZone = new BasicInstrumentZone();
-    globalZone.isGlobal = true;
+    const globalZone = preset.DLSInstrument.globalZone;
     
     // read articulators
     const globalLart = findRIFFListType(chunks, "lart");
@@ -86,14 +84,13 @@ export function readDLSInstrument(chunk)
     // reverb
     if (globalZone.modulators.find(m => m.modulatorDestination === generatorTypes.reverbEffectsSend) === undefined)
     {
-        globalZone.modulators.push(Modulator.copy(DEFAULT_DLS_REVERB));
+        globalZone.addModulators(Modulator.copy(DEFAULT_DLS_REVERB));
     }
     // chorus
     if (globalZone.modulators.find(m => m.modulatorDestination === generatorTypes.chorusEffectsSend) === undefined)
     {
-        globalZone.modulators.push(Modulator.copy(DEFAULT_DLS_CHORUS));
+        globalZone.addModulators(Modulator.copy(DEFAULT_DLS_CHORUS));
     }
-    preset.DLSInstrument.instrumentZones.push(globalZone);
     
     // read regions
     for (let i = 0; i < regions; i++)
@@ -111,11 +108,11 @@ export function readDLSInstrument(chunk)
         const zone = this.readRegion(chunk);
         if (zone)
         {
-            preset.DLSInstrument.instrumentZones.push(zone);
+            preset.DLSInstrument.addZones(zone);
         }
     }
     
-    this.presets.push(preset);
-    this.instruments.push(preset.DLSInstrument);
+    this.addPresets(preset);
+    this.addInstruments(preset.DLSInstrument);
     SpessaSynthGroupEnd();
 }

package/src/soundfont/dls/read_lart.js

@@ -4,7 +4,7 @@ import { readArticulation } from "./read_articulation.js";
 /**
  * @param lartChunk {RiffChunk|undefined}
  * @param lar2Chunk {RiffChunk|undefined}
- * @param zone {BasicInstrumentZone}
+ * @param zone {BasicZone}
  * @this {DLSSoundFont}
  */
 export function readLart(lartChunk, lar2Chunk, zone)
@@ -16,8 +16,8 @@ export function readLart(lartChunk, lar2Chunk, zone)
             const art1 = readRIFFChunk(lartChunk.chunkData);
             this.verifyHeader(art1, "art1", "art2");
             const modsAndGens = readArticulation(art1, true);
-            zone.generators.push(...modsAndGens.generators);
-            zone.modulators.push(...modsAndGens.modulators);
+            zone.addGenerators(...modsAndGens.generators);
+            zone.addModulators(...modsAndGens.modulators);
         }
     }
     
@@ -28,8 +28,8 @@ export function readLart(lartChunk, lar2Chunk, zone)
             const art2 = readRIFFChunk(lar2Chunk.chunkData);
             this.verifyHeader(art2, "art2", "art1");
             const modsAndGens = readArticulation(art2, false);
-            zone.generators.push(...modsAndGens.generators);
-            zone.modulators.push(...modsAndGens.modulators);
+            zone.addGenerators(...modsAndGens.generators);
+            zone.addModulators(...modsAndGens.modulators);
         }
     }
 }

package/src/soundfont/dls/read_region.js

@@ -1,7 +1,8 @@
 import { readLittleEndian, signedInt16 } from "../../utils/byte_functions/little_endian.js";
 import { findRIFFListType, readRIFFChunk } from "../basic_soundfont/riff_chunk.js";
 import { DLSZone } from "./dls_zone.js";
-import { Generator, generatorTypes } from "../basic_soundfont/generator.js";
+import { Generator } from "../basic_soundfont/generator.js";
+import { generatorTypes } from "../basic_soundfont/generator_types.js";
 
 /**
  * @this {DLSSoundFont}
@@ -51,7 +52,7 @@ export function readRegion(chunk)
     const exclusive = readLittleEndian(regionHeader.chunkData, 2);
     if (exclusive !== 0)
     {
-        zone.generators.push(new Generator(generatorTypes.exclusiveClass, exclusive));
+        zone.addGenerators(new Generator(generatorTypes.exclusiveClass, exclusive));
     }
     
     // lart
@@ -60,7 +61,6 @@ export function readRegion(chunk)
     this.readLart(lart, lar2, zone);
     
     // wsmp: wave sample chunk
-    zone.isGlobal = false;
     const waveSampleChunk = regionChunks.find(c => c.header === "wsmp");
     // cbSize
     readLittleEndian(waveSampleChunk.chunkData, 4);

package/src/soundfont/read_sf2/instruments.js

@@ -33,7 +33,16 @@ export class Instrument extends BasicInstrument
         this.instrumentZonesAmount = amount;
         for (let i = this.instrumentZoneIndex; i < this.instrumentZonesAmount + this.instrumentZoneIndex; i++)
         {
-            this.instrumentZones.push(zones[i]);
+            const zone = zones[i];
+            if (zone.hasSample())
+            {
+                this.addZones(zone);
+            }
+            else
+            {
+                // global!
+                this.globalZone.copyFrom(zone);
+            }
         }
     }
 }

package/src/soundfont/read_sf2/modulators.js

@@ -1,24 +1,5 @@
 import { readLittleEndian, signedInt16 } from "../../utils/byte_functions/little_endian.js";
-import { IndexedByteArray } from "../../utils/indexed_array.js";
-import { Modulator } from "../basic_soundfont/modulator.js";
-
-
-export class ReadModulator extends Modulator
-{
-    /**
-     * Creates a modulator
-     * @param dataArray {IndexedByteArray}
-     */
-    constructor(dataArray)
-    {
-        const srcEnum = readLittleEndian(dataArray, 2);
-        const destination = readLittleEndian(dataArray, 2);
-        const amount = signedInt16(dataArray[dataArray.currentIndex++], dataArray[dataArray.currentIndex++]);
-        const secSrcEnum = readLittleEndian(dataArray, 2);
-        const transformType = readLittleEndian(dataArray, 2);
-        super(srcEnum, secSrcEnum, destination, amount, transformType);
-    }
-}
+import { DecodedModulator, Modulator } from "../basic_soundfont/modulator.js";
 
 /**
  * Reads the modulator read
@@ -27,10 +8,16 @@ export class ReadModulator extends Modulator
  */
 export function readModulators(modulatorChunk)
 {
-    let gens = [];
+    let mods = [];
     while (modulatorChunk.chunkData.length > modulatorChunk.chunkData.currentIndex)
     {
-        gens.push(new ReadModulator(modulatorChunk.chunkData));
+        const dataArray = modulatorChunk.chunkData;
+        const sourceEnum = readLittleEndian(dataArray, 2);
+        const destination = readLittleEndian(dataArray, 2);
+        const amount = signedInt16(dataArray[dataArray.currentIndex++], dataArray[dataArray.currentIndex++]);
+        const secondarySourceEnum = readLittleEndian(dataArray, 2);
+        const transformType = readLittleEndian(dataArray, 2);
+        mods.push(new DecodedModulator(sourceEnum, secondarySourceEnum, destination, amount, transformType));
     }
-    return gens;
+    return mods;
 }

package/src/soundfont/read_sf2/presets.js

@@ -43,7 +43,16 @@ export class Preset extends BasicPreset
         this.presetZonesAmount = amount;
         for (let i = this.presetZoneStartIndex; i < this.presetZonesAmount + this.presetZoneStartIndex; i++)
         {
-            this.presetZones.push(zones[i]);
+            const zone = zones[i];
+            if (zone.hasInstrument())
+            {
+                this.presetZones.push(zone);
+            }
+            else
+            {
+                // global!
+                this.globalZone.copyFrom(zone);
+            }
         }
     }
 }

package/src/soundfont/read_sf2/soundfont.js

@@ -11,7 +11,7 @@ import { consoleColors } from "../../utils/other.js";
 import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo } from "../../utils/loggin.js";
 import { readBytesAsString } from "../../utils/byte_functions/string.js";
 import { stbvorbis } from "../../externals/stbvorbis_sync/stbvorbis_sync.min.js";
-import { BasicSoundBank } from "../basic_soundfont/basic_soundfont.js";
+import { BasicSoundBank } from "../basic_soundfont/basic_soundbank.js";
 import { Generator } from "../basic_soundfont/generator.js";
 import { Modulator } from "../basic_soundfont/modulator.js";
 
@@ -215,7 +215,6 @@ export class SoundFont2 extends BasicSoundBank
          * @type {Modulator[]}
          */
         let instrumentModulators = readModulators(presetInstrumentModulatorsChunk);
-        
         /**
          * read all the instrument zones
          * @type {InstrumentZone[]}
@@ -243,9 +242,8 @@ export class SoundFont2 extends BasicSoundBank
         
         let presetZones = readPresetZones(presetZonesChunk, presetGenerators, presetModulators, this.instruments);
         
-        this.presets.push(...readPresets(presetHeadersChunk, presetZones, this));
-        this.presets.sort((a, b) => (a.program - b.program) + (a.bank - b.bank));
-        this._parseInternal();
+        this.addPresets(...readPresets(presetHeadersChunk, presetZones, this));
+        this.flush();
         SpessaSynthInfo(
             `%cParsing finished! %c"${this.soundFontInfo["INAM"]}"%c has %c${this.presets.length} %cpresets,
         %c${this.instruments.length}%c instruments and %c${this.samples.length}%c samples.`,

package/src/soundfont/read_sf2/zones.js

@@ -1,9 +1,11 @@
 import { readLittleEndian } from "../../utils/byte_functions/little_endian.js";
 import { IndexedByteArray } from "../../utils/indexed_array.js";
 import { RiffChunk } from "../basic_soundfont/riff_chunk.js";
-import { BasicInstrumentZone, BasicPresetZone } from "../basic_soundfont/basic_zones.js";
-import { Generator, generatorTypes } from "../basic_soundfont/generator.js";
+import { BasicPresetZone } from "../basic_soundfont/basic_preset_zone.js";
+import { Generator } from "../basic_soundfont/generator.js";
 import { Modulator } from "../basic_soundfont/modulator.js";
+import { generatorTypes } from "../basic_soundfont/generator_types.js";
+import { BasicInstrumentZone } from "../basic_soundfont/basic_instrument_zone.js";
 
 /**
  * zones.js
@@ -23,7 +25,6 @@ export class InstrumentZone extends BasicInstrumentZone
         this.modulatorZoneStartIndex = readLittleEndian(dataArray, 2);
         this.modulatorZoneSize = 0;
         this.generatorZoneSize = 0;
-        this.isGlobal = true;
     }
     
     setZoneSize(modulatorZoneSize, generatorZoneSize)
@@ -40,7 +41,12 @@ export class InstrumentZone extends BasicInstrumentZone
     {
         for (let i = this.generatorZoneStartIndex; i < this.generatorZoneStartIndex + this.generatorZoneSize; i++)
         {
-            this.generators.push(generators[i]);
+            const g = generators[i];
+            if (!g)
+            {
+                throw new Error("Missing generator in instrument zone! The file may corrupted.");
+            }
+            this.addGenerators(g);
         }
     }
     
@@ -52,7 +58,12 @@ export class InstrumentZone extends BasicInstrumentZone
     {
         for (let i = this.modulatorZoneStartIndex; i < this.modulatorZoneStartIndex + this.modulatorZoneSize; i++)
         {
-            this.modulators.push(modulators[i]);
+            const m = modulators[i];
+            if (!m)
+            {
+                throw new Error("Missing modulator in instrument zone! The file may corrupted.");
+            }
+            this.addModulators(m);
         }
     }
     
@@ -65,35 +76,7 @@ export class InstrumentZone extends BasicInstrumentZone
         let sampleID = this.generators.find(g => g.generatorType === generatorTypes.sampleID);
         if (sampleID)
         {
-            this.sample = samples[sampleID.generatorValue];
-            this.isGlobal = false;
-            this.sample.useCount++;
-        }
-    }
-    
-    /**
-     * Reads the keyRange of the zone
-     */
-    getKeyRange()
-    {
-        let range = this.generators.find(g => g.generatorType === generatorTypes.keyRange);
-        if (range)
-        {
-            this.keyRange.min = range.generatorValue & 0x7F;
-            this.keyRange.max = (range.generatorValue >> 8) & 0x7F;
-        }
-    }
-    
-    /**
-     * reads the velolicty range of the zone
-     */
-    getVelRange()
-    {
-        let range = this.generators.find(g => g.generatorType === generatorTypes.velRange);
-        if (range)
-        {
-            this.velRange.min = range.generatorValue & 0x7F;
-            this.velRange.max = (range.generatorValue >> 8) & 0x7F;
+            this.setSample(samples[sampleID.generatorValue]);
         }
     }
 }
@@ -123,8 +106,6 @@ export function readInstrumentZones(zonesChunk, instrumentGenerators, instrument
             zones[zones.length - 1].getGenerators(instrumentGenerators);
             zones[zones.length - 1].getModulators(instrumentModulators);
             zones[zones.length - 1].getSample(instrumentSamples);
-            zones[zones.length - 1].getKeyRange();
-            zones[zones.length - 1].getVelRange();
         }
         zones.push(zone);
     }
@@ -149,7 +130,6 @@ export class PresetZone extends BasicPresetZone
         this.modulatorZoneStartIndex = readLittleEndian(dataArray, 2);
         this.modulatorZoneSize = 0;
         this.generatorZoneSize = 0;
-        this.isGlobal = true;
     }
     
     setZoneSize(modulatorZoneSize, generatorZoneSize)
@@ -166,7 +146,12 @@ export class PresetZone extends BasicPresetZone
     {
         for (let i = this.generatorZoneStartIndex; i < this.generatorZoneStartIndex + this.generatorZoneSize; i++)
         {
-            this.generators.push(generators[i]);
+            const g = generators[i];
+            if (!g)
+            {
+                throw new Error("Missing generator in preset zone! The file may corrupted.");
+            }
+            this.addGenerators(g);
         }
     }
     
@@ -178,7 +163,12 @@ export class PresetZone extends BasicPresetZone
     {
         for (let i = this.modulatorZoneStartIndex; i < this.modulatorZoneStartIndex + this.modulatorZoneSize; i++)
         {
-            this.modulators.push(modulators[i]);
+            const m = modulators[i];
+            if (!m)
+            {
+                throw new Error("Missing modulator in preset zone! The file may corrupted.");
+            }
+            this.addModulators(m);
         }
     }
     
@@ -191,35 +181,7 @@ export class PresetZone extends BasicPresetZone
         let instrumentID = this.generators.find(g => g.generatorType === generatorTypes.instrument);
         if (instrumentID)
         {
-            this.instrument = instruments[instrumentID.generatorValue];
-            this.instrument.addUseCount();
-            this.isGlobal = false;
-        }
-    }
-    
-    /**
-     * Reads the keyRange of the zone
-     */
-    getKeyRange()
-    {
-        let range = this.generators.find(g => g.generatorType === generatorTypes.keyRange);
-        if (range)
-        {
-            this.keyRange.min = range.generatorValue & 0x7F;
-            this.keyRange.max = (range.generatorValue >> 8) & 0x7F;
-        }
-    }
-    
-    /**
-     * reads the velolicty range of the zone
-     */
-    getVelRange()
-    {
-        let range = this.generators.find(g => g.generatorType === generatorTypes.velRange);
-        if (range)
-        {
-            this.velRange.min = range.generatorValue & 0x7F;
-            this.velRange.max = (range.generatorValue >> 8) & 0x7F;
+            this.setInstrument(instruments[instrumentID.generatorValue]);
         }
     }
 }
@@ -249,8 +211,6 @@ export function readPresetZones(zonesChunk, presetGenerators, presetModulators,
             zones[zones.length - 1].getGenerators(presetGenerators);
             zones[zones.length - 1].getModulators(presetModulators);
             zones[zones.length - 1].getInstrument(instruments);
-            zones[zones.length - 1].getKeyRange();
-            zones[zones.length - 1].getVelRange();
         }
         zones.push(zone);
     }

package/src/synthetizer/README.md

@@ -1,7 +1,7 @@
-## This is the main synthesizer folder.
+## This is the synthesizer folder.
 
 The code here is responsible for making the actual sound.
 This is the heart of the SpessaSynth library.
 
-- `audio_engine` - the core synthesis engine, it theoretically can run on non-browser environments.
-- `audio_effects` - the WebAudioAPI audio effects.
+- `audio_engine` - the core synthesis engine, it theoretically can run on non-browser environments
+- `synth_constants.js` - contains the synthesizer's configuration constants

package/src/synthetizer/audio_engine/README.md

@@ -6,4 +6,4 @@ The code here is responsible for a single midi channel, synthesizing the sound t
 - `engine_components` contains the various digital signal processing functions such as the wavetable oscillator, low
   pass filter, etc.
 
-For those interested, `render_voice.js` file contains the actual DSP synthesis code.
+For those interested, `engine_methods/render_voice.js` file contains the actual DSP synthesis code.

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

@@ -1,10 +1,9 @@
 import { getModulatorCurveValue, MOD_PRECOMPUTED_LENGTH } from "./modulator_curves.js";
 import { VolumeEnvelope } from "./volume_envelope.js";
 import { ModulationEnvelope } from "./modulation_envelope.js";
-import { generatorLimits, generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
 import { Modulator, modulatorSources } from "../../../soundfont/basic_soundfont/modulator.js";
 import { NON_CC_INDEX_OFFSET } from "./controller_tables.js";
-import { SpessaSynthWarn } from "../../../utils/loggin.js";
+import { generatorLimits, generatorTypes } from "../../../soundfont/basic_soundfont/generator_types.js";
 
 /**
  * compute_modulator.js
@@ -146,22 +145,23 @@ export function computeModulators(voice, sourceUsesCC = -1, sourceIndex = 0)
         modulatedGenerators.set(generators);
         modulators.forEach(mod =>
         {
-            const limits = generatorLimits[mod.modulatorDestination];
-            if (!limits)
-            {
-                SpessaSynthWarn(`Invalid modulator: ${mod.modulatorDestination}`);
-                return;
-            }
-            const newValue = modulatedGenerators[mod.modulatorDestination] + computeModulator(
+            modulatedGenerators[mod.modulatorDestination] += computeModulator(
                 this.midiControllers,
                 mod,
                 voice
             );
-            modulatedGenerators[mod.modulatorDestination] = Math.max(
-                limits.min,
-                Math.min(newValue, limits.max)
-            );
         });
+        // apply limits
+        for (let gen = 0; gen < modulatedGenerators.length; gen++)
+        {
+            const limit = generatorLimits[gen];
+            if (!limit)
+            {
+                // skip unused
+                continue;
+            }
+            modulatedGenerators[gen] = Math.min(limit.max, Math.max(limit.min, modulatedGenerators[gen]));
+        }
         VolumeEnvelope.recalculate(voice);
         ModulationEnvelope.recalculate(voice);
         return;
@@ -201,14 +201,15 @@ export function computeModulators(voice, sourceUsesCC = -1, sourceIndex = 0)
                 {
                     if (m.modulatorDestination === destination)
                     {
-                        const limits = generatorLimits[mod.modulatorDestination];
-                        const newValue = modulatedGenerators[mod.modulatorDestination] + m.currentValue;
-                        modulatedGenerators[mod.modulatorDestination] = Math.max(
-                            limits.min,
-                            Math.min(newValue, limits.max)
-                        );
+                        modulatedGenerators[destination] += m.currentValue;
                     }
                 });
+                // apply limits
+                const limits = generatorLimits[destination];
+                modulatedGenerators[destination] = Math.max(
+                    limits.min,
+                    Math.min(modulatedGenerators[destination], limits.max)
+                );
                 computedDestinations.add(destination);
             }
         }