spessasynth_core 3.26.17 → 3.26.19

package/src/soundfont/basic_soundfont/write_dls/rgn2.js

@@ -1,13 +1,13 @@
 import { combineArrays, IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
-import { generatorTypes } from "../generator.js";
 import { writeRIFFOddSize } from "../riff_chunk.js";
 import { writeWavesample } from "./wsmp.js";
 import { writeArticulator } from "./art2.js";
+import { generatorTypes } from "../generator_types.js";
 
 /**
  * @param zone {BasicInstrumentZone}
- * @param globalZone {BasicInstrumentZone}
+ * @param globalZone {BasicGlobalZone}
  * @this {BasicSoundBank}
  * @returns {IndexedByteArray}
  */

package/src/soundfont/basic_soundfont/write_sf2/ibag.js

@@ -2,6 +2,8 @@ import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
 
+const BAG_SIZE = 4;
+
 /**
  * @this {BasicSoundBank}
  * @returns {IndexedByteArray}
@@ -9,36 +11,37 @@ import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
 export function getIBAG()
 {
     // write all ibag with their start indexes as they were changed in getIGEN() and getIMOD()
-    const ibagsize = this.instruments.reduce((sum, i) => i.instrumentZones.length * 4 + sum, 4);
+    const ibagsize = this.instruments.reduce(
+        (sum, i) =>
+            // +1 because global zone
+            (i.instrumentZones.length + 1) * BAG_SIZE + sum,
+        BAG_SIZE
+    );
     const ibagdata = new IndexedByteArray(ibagsize);
-    let zoneID = 0;
     let generatorIndex = 0;
     let modulatorIndex = 0;
+    /**
+     * @param z {BasicZone}
+     */
+    const writeZone = z =>
+    {
+        writeWord(ibagdata, generatorIndex);
+        writeWord(ibagdata, modulatorIndex);
+        generatorIndex += z.generators.length;
+        modulatorIndex += z.modulators.length;
+    };
+    
     for (const inst of this.instruments)
     {
-        // ensure that the first zone is global
-        const zones = inst.instrumentZones.filter(z => !z.isGlobal);
-        const global = inst.instrumentZones.filter(z => z.isGlobal);
-        // only take the first one
-        if (global?.[0])
+        writeZone(inst.globalZone);
+        for (const ibag of inst.instrumentZones)
         {
-            zones.unshift(global?.[0]);
-        }
-        inst.instrumentZoneIndex = zoneID;
-        for (const ibag of zones)
-        {
-            ibag.zoneID = zoneID;
-            writeWord(ibagdata, generatorIndex);
-            writeWord(ibagdata, modulatorIndex);
-            generatorIndex += ibag.generators.length;
-            modulatorIndex += ibag.modulators.length;
-            zoneID++;
+            writeZone(ibag);
         }
     }
     // write the terminal IBAG
     writeWord(ibagdata, generatorIndex);
     writeWord(ibagdata, modulatorIndex);
-    
     return writeRIFFChunk(new RiffChunk(
         "ibag",
         ibagdata.length,

package/src/soundfont/basic_soundfont/write_sf2/igen.js

@@ -1,8 +1,8 @@
 import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
-
-import { Generator, generatorTypes } from "../generator.js";
+import { GEN_BYTE_SIZE, Generator } from "../generator.js";
+import { generatorTypes } from "../generator_types.js";
 
 /**
  * @this {BasicSoundBank}
@@ -11,22 +11,23 @@ import { Generator, generatorTypes } from "../generator.js";
 export function getIGEN()
 {
     // go through all instruments -> zones and write generators sequentially (add 4 for terminal)
-    let igensize = 4;
+    let igensize = GEN_BYTE_SIZE;
     for (const inst of this.instruments)
     {
+        igensize += inst.globalZone.generators.length * GEN_BYTE_SIZE;
         igensize += inst.instrumentZones.reduce((sum, z) =>
         {
             // clear sample and range generators before determining the size
-            z.generators = z.generators.filter(g =>
+            z.generators = (z.generators.filter(g =>
                 g.generatorType !== generatorTypes.sampleID &&
                 g.generatorType !== generatorTypes.keyRange &&
                 g.generatorType !== generatorTypes.velRange
-            );
+            ));
             // add sample and ranges if necessary
-            // unshift vel then key (to make key first) and the instrument is last
+            // unshift vel then key (to make key first) and the sample is last
             if (z.hasVelRange)
             {
-                z.generators.unshift(new Generator(
+                z.prependGenerator(new Generator(
                     generatorTypes.velRange,
                     z.velRange.max << 8 | Math.max(z.velRange.min, 0),
                     false
@@ -34,44 +35,47 @@ export function getIGEN()
             }
             if (z.hasKeyRange)
             {
-                z.generators.unshift(new Generator(
+                z.prependGenerator(new Generator(
                     generatorTypes.keyRange,
                     z.keyRange.max << 8 | Math.max(z.keyRange.min, 0),
                     false
                 ));
             }
-            if (!z.isGlobal)
-            {
-                // write sample
-                z.generators.push(new Generator(
-                    generatorTypes.sampleID,
-                    this.samples.indexOf(z.sample),
-                    false
-                ));
-            }
-            return z.generators.length * 4 + sum;
+            // add sample id
+            z.addGenerators(new Generator(
+                generatorTypes.sampleID,
+                this.samples.indexOf(z.sample),
+                false
+            ));
+            return z.generators.length * GEN_BYTE_SIZE + sum;
         }, 0);
     }
     const igendata = new IndexedByteArray(igensize);
-    let igenIndex = 0;
+    
+    /**
+     * @param z {BasicZone}
+     */
+    const writeZone = z =>
+    {
+        for (const gen of z.generators)
+        {
+            // name is deceptive, it works on negatives
+            writeWord(igendata, gen.generatorType);
+            writeWord(igendata, gen.generatorValue);
+        }
+    };
+    
     for (const instrument of this.instruments)
     {
+        // global zone
+        writeZone(instrument.globalZone);
         for (const instrumentZone of instrument.instrumentZones)
         {
-            // set the start index here
-            instrumentZone.generatorZoneStartIndex = igenIndex;
-            for (const gen of instrumentZone.generators)
-            {
-                // name is deceptive, it works on negatives
-                writeWord(igendata, gen.generatorType);
-                writeWord(igendata, gen.generatorValue);
-                igenIndex++;
-            }
+            writeZone(instrumentZone);
         }
     }
     // terminal generator, is zero
     writeDword(igendata, 0);
-    
     return writeRIFFChunk(new RiffChunk(
         "igen",
         igendata.length,

package/src/soundfont/basic_soundfont/write_sf2/imod.js

@@ -1,6 +1,7 @@
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeLittleEndian, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { MOD_BYTE_SIZE } from "../modulator.js";
 
 /**
  * @this {BasicSoundBank}
@@ -10,33 +11,42 @@ export function getIMOD()
 {
     // very similar to igen,
     // go through all instruments -> zones and write modulators sequentially
-    let imodsize = 10;
+    let imodsize = MOD_BYTE_SIZE; // terminal
     for (const inst of this.instruments)
     {
-        imodsize += inst.instrumentZones.reduce((sum, z) => z.modulators.length * 10 + sum, 0);
+        imodsize += inst.globalZone.modulators.length * MOD_BYTE_SIZE;
+        // start with one mod for global
+        imodsize += inst.instrumentZones.reduce((sum, z) => z.modulators.length * MOD_BYTE_SIZE + sum, 0);
     }
     const imoddata = new IndexedByteArray(imodsize);
-    let imodIndex = 0;
+    
+    /**
+     * @param z {BasicZone}
+     */
+    const writeZone = z =>
+    {
+        for (const mod of z.modulators)
+        {
+            writeWord(imoddata, mod.getSourceEnum());
+            writeWord(imoddata, mod.modulatorDestination);
+            writeWord(imoddata, mod.transformAmount);
+            writeWord(imoddata, mod.getSecSrcEnum());
+            writeWord(imoddata, mod.transformType);
+        }
+    };
+    
     for (const inst of this.instruments)
     {
-        for (const ibag of inst.instrumentZones)
+        // global
+        writeZone(inst.globalZone);
+        for (const instrumentZone of inst.instrumentZones)
         {
-            // set the start index here
-            ibag.modulatorZoneStartIndex = imodIndex;
-            for (const mod of ibag.modulators)
-            {
-                writeWord(imoddata, mod.getSourceEnum());
-                writeWord(imoddata, mod.modulatorDestination);
-                writeWord(imoddata, mod.transformAmount);
-                writeWord(imoddata, mod.getSecSrcEnum());
-                writeWord(imoddata, mod.transformType);
-                imodIndex++;
-            }
+            writeZone(instrumentZone);
         }
     }
     
     // terminal modulator, is zero
-    writeLittleEndian(imoddata, 0, 10);
+    writeLittleEndian(imoddata, 0, MOD_BYTE_SIZE);
     
     return writeRIFFChunk(new RiffChunk(
         "imod",

package/src/soundfont/basic_soundfont/write_sf2/inst.js

@@ -3,24 +3,23 @@ import { writeStringAsBytes } from "../../../utils/byte_functions/string.js";
 import { writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
 
+const INST_SIZE = 22;
+
 /**
  * @this {BasicSoundBank}
  * @returns {IndexedByteArray}
  */
 export function getINST()
 {
-    const instsize = this.instruments.length * 22 + 22;
+    const instsize = this.instruments.length * INST_SIZE + INST_SIZE;
     const instdata = new IndexedByteArray(instsize);
     // the instrument start index is adjusted in ibag, write it here
     let instrumentStart = 0;
-    let instrumentID = 0;
     for (const inst of this.instruments)
     {
         writeStringAsBytes(instdata, inst.instrumentName, 20);
         writeWord(instdata, instrumentStart);
-        instrumentStart += inst.instrumentZones.length;
-        inst.instrumentID = instrumentID;
-        instrumentID++;
+        instrumentStart += inst.instrumentZones.length + 1; // global
     }
     // write EOI
     writeStringAsBytes(instdata, "EOI", 20);

package/src/soundfont/basic_soundfont/write_sf2/pbag.js

@@ -2,6 +2,8 @@ import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
 
+const BAG_SIZE = 4;
+
 /**
  * @this {BasicSoundBank}
  * @returns {IndexedByteArray}
@@ -9,30 +11,31 @@ import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
 export function getPBAG()
 {
     // write all pbag with their start indexes as they were changed in getPGEN() and getPMOD()
-    const pbagsize = this.presets.reduce((sum, i) => i.presetZones.length * 4 + sum, 4);
+    const pbagsize = this.presets.reduce((sum, i) =>
+        // +1 because global zone
+        (i.presetZones.length + 1) * BAG_SIZE + sum, BAG_SIZE);
     const pbagdata = new IndexedByteArray(pbagsize);
-    let zoneID = 0;
     let generatorIndex = 0;
     let modulatorIndex = 0;
+    
+    /**
+     * @param z {BasicZone}
+     */
+    const writeZone = z =>
+    {
+        writeWord(pbagdata, generatorIndex);
+        writeWord(pbagdata, modulatorIndex);
+        generatorIndex += z.generators.length;
+        modulatorIndex += z.modulators.length;
+    };
+    
     for (const preset of this.presets)
     {
-        // ensure that the first zone is global
-        const zones = preset.presetZones.filter(z => !z.isGlobal);
-        const global = preset.presetZones.filter(z => z.isGlobal);
-        // only take the first one
-        if (global?.[0])
-        {
-            zones.unshift(global?.[0]);
-        }
-        preset.presetZoneStartIndex = zoneID;
-        for (const pbag of zones)
+        // global
+        writeZone(preset.globalZone);
+        for (const pbag of preset.presetZones)
         {
-            pbag.zoneID = zoneID;
-            writeWord(pbagdata, generatorIndex);
-            writeWord(pbagdata, modulatorIndex);
-            generatorIndex += pbag.generators.length;
-            modulatorIndex += pbag.modulators.length;
-            zoneID++;
+            writeZone(pbag);
         }
     }
     // write the terminal PBAG

package/src/soundfont/basic_soundfont/write_sf2/pgen.js

@@ -1,8 +1,9 @@
-import { writeWord } from "../../../utils/byte_functions/little_endian.js";
+import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
 
-import { Generator, generatorTypes } from "../generator.js";
+import { GEN_BYTE_SIZE, Generator } from "../generator.js";
+import { generatorTypes } from "../generator_types.js";
 
 /**
  * @this {BasicSoundBank}
@@ -12,9 +13,10 @@ export function getPGEN()
 {
     // almost identical to igen, except the correct instrument instead of sample gen
     // goes through all preset zones and writes generators sequentially (add 4 for terminal)
-    let pgensize = 4;
+    let pgensize = GEN_BYTE_SIZE;
     for (const preset of this.presets)
     {
+        pgensize += preset.globalZone.generators.length * GEN_BYTE_SIZE;
         pgensize += preset.presetZones.reduce((size, z) =>
         {
             // clear instrument and range generators before determining the size
@@ -26,7 +28,7 @@ export function getPGEN()
             // unshift vel then key and instrument is last
             if (z.hasVelRange)
             {
-                z.generators.unshift(new Generator(
+                z.prependGenerator(new Generator(
                     generatorTypes.velRange,
                     z.velRange.max << 8 | Math.max(z.velRange.min, 0),
                     false
@@ -34,45 +36,46 @@ export function getPGEN()
             }
             if (z.hasKeyRange)
             {
-                z.generators.unshift(new Generator(
+                z.prependGenerator(new Generator(
                     generatorTypes.keyRange,
                     z.keyRange.max << 8 | Math.max(z.keyRange.min, 0),
                     false
                 ));
             }
-            if (!z.isGlobal)
-            {
-                // write the instrument
-                z.generators.push(new Generator(
-                    generatorTypes.instrument,
-                    this.instruments.indexOf(z.instrument),
-                    false
-                ));
-            }
-            return z.generators.length * 4 + size;
+            // write the instrument id
+            z.addGenerators(new Generator(
+                generatorTypes.instrument,
+                this.instruments.indexOf(z.instrument),
+                false
+            ));
+            return z.generators.length * GEN_BYTE_SIZE + size;
         }, 0);
     }
     const pgendata = new IndexedByteArray(pgensize);
-    let pgenIndex = 0;
+    
+    /**
+     * @param z {BasicZone}
+     */
+    const writeZone = z =>
+    {
+        for (const gen of z.generators)
+        {
+            // name is deceptive, it works on negatives
+            writeWord(pgendata, gen.generatorType);
+            writeWord(pgendata, gen.generatorValue);
+        }
+    };
     for (const preset of this.presets)
     {
-        for (const presetZone of preset.presetZones)
+        // global zone
+        writeZone(preset.globalZone);
+        for (const zone of preset.presetZones)
         {
-            // set the start index here
-            presetZone.generatorZoneStartIndex = pgenIndex;
-            // write generators
-            for (const gen of presetZone.generators)
-            {
-                // name is deceptive, it works on negatives
-                writeWord(pgendata, gen.generatorType);
-                writeWord(pgendata, gen.generatorValue);
-            }
-            pgenIndex += presetZone.generators.length;
+            writeZone(zone);
         }
     }
     // terminal generator, is zero
-    writeWord(pgendata, 0);
-    writeWord(pgendata, 0);
+    writeDword(pgendata, 0);
     
     return writeRIFFChunk(new RiffChunk(
         "pgen",

package/src/soundfont/basic_soundfont/write_sf2/phdr.js

@@ -3,13 +3,15 @@ import { writeStringAsBytes } from "../../../utils/byte_functions/string.js";
 import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
 
+const PHDR_SIZE = 38;
+
 /**
  * @this {BasicSoundBank}
  * @returns {IndexedByteArray}
  */
 export function getPHDR()
 {
-    const phdrsize = this.presets.length * 38 + 38;
+    const phdrsize = this.presets.length * PHDR_SIZE + PHDR_SIZE;
     const phdrdata = new IndexedByteArray(phdrsize);
     // the preset start is adjusted in pbag, this is only for the terminal preset index
     let presetStart = 0;
@@ -23,7 +25,7 @@ export function getPHDR()
         writeDword(phdrdata, preset.library);
         writeDword(phdrdata, preset.genre);
         writeDword(phdrdata, preset.morphology);
-        presetStart += preset.presetZones.length;
+        presetStart += preset.presetZones.length + 1; // global
     }
     // write EOP
     writeStringAsBytes(phdrdata, "EOP", 20);

package/src/soundfont/basic_soundfont/write_sf2/pmod.js

@@ -1,6 +1,7 @@
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeLittleEndian, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { MOD_BYTE_SIZE } from "../modulator.js";
 
 /**
  * @this {BasicSoundBank}
@@ -10,33 +11,42 @@ export function getPMOD()
 {
     // very similar to imod,
     // go through all presets -> zones and write modulators sequentially
-    let pmodsize = 10;
+    let pmodsize = MOD_BYTE_SIZE;
     for (const preset of this.presets)
     {
-        pmodsize += preset.presetZones.reduce((sum, z) => z.modulators.length * 10 + sum, 0);
+        pmodsize += preset.globalZone.modulators.length * MOD_BYTE_SIZE;
+        pmodsize += preset.presetZones.reduce((sum, z) => z.modulators.length * MOD_BYTE_SIZE + sum, 0);
     }
     const pmoddata = new IndexedByteArray(pmodsize);
-    let pmodIndex = 0;
+    
+    /**
+     * @param z {BasicZone}
+     */
+    const writeZone = z =>
+    {
+        for (const mod of z.modulators)
+        {
+            writeWord(pmoddata, mod.getSourceEnum());
+            writeWord(pmoddata, mod.modulatorDestination);
+            writeWord(pmoddata, mod.transformAmount);
+            writeWord(pmoddata, mod.getSecSrcEnum());
+            writeWord(pmoddata, mod.transformType);
+        }
+    };
+    
+    
     for (const preset of this.presets)
     {
-        for (const pbag of preset.presetZones)
+        // global
+        writeZone(preset.globalZone);
+        for (const zone of preset.presetZones)
         {
-            // set the start index here
-            pbag.modulatorZoneStartIndex = pmodIndex;
-            for (const mod of pbag.modulators)
-            {
-                writeWord(pmoddata, mod.getSourceEnum());
-                writeWord(pmoddata, mod.modulatorDestination);
-                writeWord(pmoddata, mod.transformAmount);
-                writeWord(pmoddata, mod.getSecSrcEnum());
-                writeWord(pmoddata, mod.transformType);
-                pmodIndex++;
-            }
+            writeZone(zone);
         }
     }
     
     // terminal modulator, is zero
-    writeLittleEndian(pmoddata, 0, 10);
+    writeLittleEndian(pmoddata, 0, MOD_BYTE_SIZE);
     
     return writeRIFFChunk(new RiffChunk(
         "pmod",

package/src/soundfont/basic_soundfont/write_sf2/write.js

@@ -14,12 +14,16 @@ import { getPBAG } from "./pbag.js";
 import { getPHDR } from "./phdr.js";
 import { writeLittleEndian, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo } from "../../../utils/loggin.js";
+import { MOD_BYTE_SIZE } from "../modulator.js";
+import { fillWithDefaults } from "../../../utils/fill_with_defaults.js";
 /**
  * @typedef {Object} SoundFont2WriteOptions
- * @property {boolean} compress - if the soundfont should be compressed with the Ogg Vorbis codec
- * @property {number} compressionQuality - the vorbis compression quality, from -0.1 to 1
- * @property {EncodeVorbisFunction|undefined} compressionFunction - the encode vorbis function.
- * Can be undefined if not compressed.
+ * @property {boolean|undefined} compress - if the soundfont should be compressed with the Ogg Vorbis codec
+ * @property {number|undefined} compressionQuality - the vorbis compression quality, from -0.1 to 1
+ * @property {EncodeVorbisFunction|undefined} compressionFunction -
+ * the encode vorbis function. Can be undefined if not compressed.
+ * @property {boolean|undefined} writeDefaultModulators - if the DMOD chunk should be written.
+ * Recommended.
  */
 
 /**
@@ -28,7 +32,8 @@ import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo } from
 const DEFAULT_WRITE_OPTIONS = {
     compress: false,
     compressionQuality: 0.5,
-    compressionFunction: undefined
+    compressionFunction: undefined,
+    writeDefaultModulators: true
 };
 
 /**
@@ -39,6 +44,7 @@ const DEFAULT_WRITE_OPTIONS = {
  */
 export function write(options = DEFAULT_WRITE_OPTIONS)
 {
+    options = fillWithDefaults(options, DEFAULT_WRITE_OPTIONS);
     if (options.compress)
     {
         if (typeof options.compressionFunction !== "function")
@@ -72,7 +78,7 @@ export function write(options = DEFAULT_WRITE_OPTIONS)
         this.soundFontInfo["ifil"] = "3.0"; // set version to 3
     }
     
-    if (this.defaultModulators.length > 0)
+    if (options?.writeDefaultModulators)
     {
         // trigger the DMOD write
         this.soundFontInfo["DMOD"] = `${this.defaultModulators.length} Modulators`;
@@ -108,7 +114,7 @@ export function write(options = DEFAULT_WRITE_OPTIONS)
                 consoleColors.recognized,
                 consoleColors.info
             );
-            let dmodsize = 10 + mods.length * 10;
+            let dmodsize = MOD_BYTE_SIZE + mods.length * MOD_BYTE_SIZE;
             const dmoddata = new IndexedByteArray(dmodsize);
             for (const mod of mods)
             {
@@ -120,7 +126,7 @@ export function write(options = DEFAULT_WRITE_OPTIONS)
             }
             
             // terminal modulator, is zero
-            writeLittleEndian(dmoddata, 0, 10);
+            writeLittleEndian(dmoddata, 0, MOD_BYTE_SIZE);
             
             infoArrays.push(writeRIFFChunk(new RiffChunk(
                 type,

package/src/soundfont/dls/articulator_converter.js

@@ -1,11 +1,17 @@
 import { DLSSources } from "./dls_sources.js";
-import { getModSourceEnum, Modulator, modulatorCurveTypes, modulatorSources } from "../basic_soundfont/modulator.js";
+import {
+    DecodedModulator,
+    getModSourceEnum,
+    Modulator,
+    modulatorCurveTypes,
+    modulatorSources
+} from "../basic_soundfont/modulator.js";
 import { midiControllers } from "../../midi/midi_message.js";
 import { DLSDestinations } from "./dls_destinations.js";
 
-import { generatorTypes } from "../basic_soundfont/generator.js";
 import { consoleColors } from "../../utils/other.js";
 import { SpessaSynthWarn } from "../../utils/loggin.js";
+import { generatorTypes } from "../basic_soundfont/generator_types.js";
 
 /**
  * @param source {number}
@@ -385,7 +391,7 @@ export function getSF2ModulatorFromArticulator(
     }
     
     // return the modulator!
-    return new Modulator(
+    return new DecodedModulator(
         sourceEnumFinal,
         secSourceEnumFinal,
         destinationGenerator,

package/src/soundfont/dls/dls_preset.js

@@ -1,5 +1,5 @@
 import { BasicPreset } from "../basic_soundfont/basic_preset.js";
-import { BasicPresetZone } from "../basic_soundfont/basic_zones.js";
+import { BasicPresetZone } from "../basic_soundfont/basic_preset_zone.js";
 import { BasicInstrument } from "../basic_soundfont/basic_instrument.js";
 
 export class DLSPreset extends BasicPreset
@@ -34,10 +34,9 @@ export class DLSPreset extends BasicPreset
         }
         
         this.DLSInstrument = new BasicInstrument();
-        this.DLSInstrument.addUseCount();
         
         const zone = new BasicPresetZone();
-        zone.instrument = this.DLSInstrument;
+        zone.setInstrument(this.DLSInstrument);
         
         this.presetZones = [zone];
     }