spessasynth_core 3.26.16 → 3.26.18

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;
     }
     
     /**
@@ -89,7 +89,6 @@ export class DLSZone extends BasicInstrumentZone
         }
         // 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");
@@ -93,7 +91,6 @@ export function readDLSInstrument(chunk)
     {
         globalZone.modulators.push(Modulator.copy(DEFAULT_DLS_CHORUS));
     }
-    preset.DLSInstrument.instrumentZones.push(globalZone);
     
     // read regions
     for (let i = 0; i < regions; i++)
@@ -111,7 +108,7 @@ export function readDLSInstrument(chunk)
         const zone = this.readRegion(chunk);
         if (zone)
         {
-            preset.DLSInstrument.instrumentZones.push(zone);
+            preset.DLSInstrument.addZone(zone);
         }
     }
     

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)

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}

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.addZone(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[]}

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.generators.push(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.modulators.push(m);
         }
     }
     
@@ -65,9 +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++;
+            this.setSample(samples[sampleID.generatorValue]);
         }
     }
     
@@ -149,7 +158,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 +174,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.generators.push(g);
         }
     }
     
@@ -178,7 +191,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.modulators.push(m);
         }
     }
     
@@ -191,9 +209,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;
+            this.setInstrument(instruments[instrumentID.generatorValue]);
         }
     }
     

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,10 @@
 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

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

@@ -1,4 +1,4 @@
-import { getModSourceEnum, Modulator, modulatorCurveTypes } from "../../../soundfont/basic_soundfont/modulator.js";
+import { Modulator, modulatorCurveTypes, modulatorSources } from "../../../soundfont/basic_soundfont/modulator.js";
 import { NON_CC_INDEX_OFFSET } from "./controller_tables.js";
 
 /**
@@ -72,8 +72,16 @@ export class DynamicModulatorSystem
                 isCC = true;
             }
             const modulator = new Modulator(
-                getModSourceEnum(modulatorCurveTypes.linear, isBipolar, 0, isCC, srcNum),
-                0x0, // linear no controller
+                srcNum,
+                modulatorCurveTypes.linear,
+                isCC ? 1 : 0,
+                isBipolar ? 1 : 0,
+                0,
+                modulatorSources.noController,
+                modulatorCurveTypes.linear,
+                0,
+                0,
+                0,
                 destination,
                 amount,
                 0

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

@@ -1,5 +1,5 @@
 import { absCentsToHz, decibelAttenuationToGain } from "./unit_converter.js";
-import { generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
+import { generatorTypes } from "../../../soundfont/basic_soundfont/generator_types.js";
 
 /**
  * lowpass_filter.js

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

@@ -32,8 +32,8 @@ import { chooseBank, isSystemXG, parseBankSelect } from "../../../utils/xg_hacks
 import { DEFAULT_PERCUSSION, GENERATOR_OVERRIDE_NO_CHANGE_VALUE } from "../../synth_constants.js";
 import { modulatorSources } from "../../../soundfont/basic_soundfont/modulator.js";
 import { DynamicModulatorSystem } from "./dynamic_modulator_system.js";
-import { generatorLimits, GENERATORS_AMOUNT } from "../../../soundfont/basic_soundfont/generator.js";
 import { computeModulators } from "./compute_modulator.js";
+import { generatorLimits, GENERATORS_AMOUNT } from "../../../soundfont/basic_soundfont/generator_types.js";
 
 /**
  * This class represents a single MIDI Channel within the synthesizer.

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

@@ -1,7 +1,7 @@
 import { timecentsToSeconds } from "./unit_converter.js";
 import { getModulatorCurveValue } from "./modulator_curves.js";
-import { generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
 import { modulatorCurveTypes } from "../../../soundfont/basic_soundfont/modulator.js";
+import { generatorTypes } from "../../../soundfont/basic_soundfont/generator_types.js";
 
 /**
  * modulation_envelope.js

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

@@ -1,4 +1,4 @@
-import { generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
+import { generatorTypes } from "../../../soundfont/basic_soundfont/generator_types.js";
 
 /**
  * stereo_panner.js

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

@@ -7,12 +7,9 @@ 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,
-    GENERATORS_AMOUNT,
-    generatorTypes
-} from "../../../soundfont/basic_soundfont/generator.js";
+import { addAndClampGenerator } from "../../../soundfont/basic_soundfont/generator.js";
 import { Modulator } from "../../../soundfont/basic_soundfont/modulator.js";
+import { GENERATORS_AMOUNT, generatorTypes } from "../../../soundfont/basic_soundfont/generator_types.js";
 
 const EXCLUSIVE_CUTOFF_TIME = -2320;
 const EXCLUSIVE_MOD_CUTOFF_TIME = -1130; // less because filter shenanigans
@@ -330,7 +327,7 @@ class Voice
             currentTime,
             voice.targetKey,
             realKey,
-            voice.generators,
+            new Int16Array(voice.generators),
             voice.modulators.map(m => Modulator.copy(m))
         );
     }
@@ -401,7 +398,7 @@ export function getVoicesForPreset(preset, bank, program, midiNote, velocity, re
             }
             
             // EMU initial attenuation correction, multiply initial attenuation by 0.4!
-            // all EMU sound cards have this quirk and all sf2 editors and players emulate it too
+            // all EMU sound cards have this quirk, and all sf2 editors and players emulate it too
             generators[generatorTypes.initialAttenuation] = Math.floor(generators[generatorTypes.initialAttenuation] * 0.4);
             
             // key override
@@ -473,9 +470,9 @@ export function getVoicesForPreset(preset, bank, program, midiNote, velocity, re
             return voices;
         }, []);
     // cache the voice
-    this.setCachedVoice(bank, program, midiNote, velocity, voices.map(v =>
-        Voice.copy(v, this.currentSynthTime, realKey)));
-    return voices;
+    this.setCachedVoice(bank, program, midiNote, velocity, voices);
+    return voices.map(v =>
+        Voice.copy(v, this.currentSynthTime, realKey));
 }
 
 /**

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

@@ -1,6 +1,7 @@
 import { decibelAttenuationToGain, timecentsToSeconds } from "./unit_converter.js";
 
-import { generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
+
+import { generatorTypes } from "../../../soundfont/basic_soundfont/generator_types.js";
 
 /**
  * volume_envelope.js

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

@@ -1,6 +1,6 @@
-import { generatorTypes } from "../../../../soundfont/basic_soundfont/generator.js";
 import { SpessaSynthWarn } from "../../../../utils/loggin.js";
 import { consoleColors } from "../../../../utils/other.js";
+import { generatorTypes } from "../../../../soundfont/basic_soundfont/generator_types.js";
 
 /**
  * http://archive.gamedev.net/archive/reference/articles/article445.html

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

@@ -54,6 +54,13 @@ export function dataEntryCoarse(dataValue)
 {
     // store in cc table
     this.midiControllers[midiControllers.dataEntryMsb] = dataValue << 7;
+    /*
+    A note on this vibrato.
+    This is a completely custom vibrato, with its own oscillator and parameters.
+    It is disabled by default,
+    only being enabled when one of the NPRN messages changing it is received
+    and stays on until the next system-reset.
+     */
     const addDefaultVibrato = () =>
     {
         if (this.channelVibrato.delay === 0 && this.channelVibrato.rate === 0 && this.channelVibrato.depth === 0)

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

@@ -1,9 +1,9 @@
-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";
 import { GENERATOR_OVERRIDE_NO_CHANGE_VALUE } from "../../synth_constants.js";
+import { generatorTypes } from "../../../soundfont/basic_soundfont/generator_types.js";
 
 /**
  * sends a "MIDI Note on message"

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

@@ -1,12 +1,12 @@
 import { VolumeEnvelope } from "../engine_components/volume_envelope.js";
 import { ModulationEnvelope } from "../engine_components/modulation_envelope.js";
-import { generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
 import { customControllers } from "../engine_components/controller_tables.js";
 import { absCentsToHz, timecentsToSeconds } from "../engine_components/unit_converter.js";
 import { getLFOValue } from "../engine_components/lfo.js";
 import { WavetableOscillator } from "../engine_components/wavetable_oscillator.js";
 import { LowpassFilter } from "../engine_components/lowpass_filter.js";
 import { interpolationTypes } from "../engine_components/enums.js";
+import { generatorTypes } from "../../../soundfont/basic_soundfont/generator_types.js";
 
 /**
  * Renders a voice to the stereo output buffer

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

@@ -1,5 +1,5 @@
-import { generatorTypes } from "../../../../soundfont/basic_soundfont/generator.js";
 import { customControllers } from "../../engine_components/controller_tables.js";
+import { generatorTypes } from "../../../../soundfont/basic_soundfont/generator_types.js";
 
 /**
  * Stops a note nearly instantly

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

@@ -8,7 +8,8 @@ import { readBytesAsString } from "../../../utils/byte_functions/string.js";
 import { synthDisplayTypes } from "../engine_components/enums.js";
 import { customControllers, NON_CC_INDEX_OFFSET } from "../engine_components/controller_tables.js";
 import { modulatorSources } from "../../../soundfont/basic_soundfont/modulator.js";
-import { generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
+
+import { generatorTypes } from "../../../soundfont/basic_soundfont/generator_types.js";
 
 /**
  * KeyNum: tuning

package/src/utils/README.md

@@ -1,5 +1,8 @@
 ## This is the utility folder.
 
-There are various utilites here used by the SpessaSynth library.
+There are various utilities here used by the SpessaSynth library.
 
-### Note that the stbvorbis_sync.js is licensed under Apache-2.0.
+- `byte_functions` - low-level byte manipulation utilities
+- `buffer_to_wav.js` - converts audio buffer to WAV format
+- `sysex_detector.js` - detects various System Exclusive messages
+- `xg_hacks.js` - XG-specific MIDI handling utilities

package/src/soundfont/basic_soundfont/basic_zones.js

@@ -1,43 +0,0 @@
-import { BasicZone } from "./basic_zone.js";
-
-export class BasicInstrumentZone extends BasicZone
-{
-    /**
-     * Zone's sample. Undefined if global
-     * @type {BasicSample|undefined}
-     */
-    sample = undefined;
-    /**
-     * The zone's use count
-     * @type {number}
-     */
-    useCount = 0;
-    
-    deleteZone()
-    {
-        this.useCount--;
-        if (this.isGlobal)
-        {
-            return;
-        }
-        this.sample.useCount--;
-    }
-}
-
-export class BasicPresetZone extends BasicZone
-{
-    /**
-     * Zone's instrument. Undefined if global
-     * @type {BasicInstrument|undefined}
-     */
-    instrument = undefined;
-    
-    deleteZone()
-    {
-        if (this.isGlobal)
-        {
-            return;
-        }
-        this.instrument.removeUseCount();
-    }
-}