spessasynth_core 3.26.15 → 3.26.16

package/package.json

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

package/src/soundfont/basic_soundfont/basic_soundfont.js

@@ -49,6 +49,12 @@ class BasicSoundBank
      */
     defaultModulators = defaultModulators.map(m => Modulator.copy(m));
     
+    /**
+     * If the bank has custom default modulators (DMOD).
+     * @type {boolean}
+     */
+    customDefaultModulators = false;
+    
     /**
      * Checks for XG drumsets and considers if this soundfont is XG.
      * @type {boolean}

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

@@ -12,7 +12,7 @@ import { getPGEN } from "./pgen.js";
 import { getPMOD } from "./pmod.js";
 import { getPBAG } from "./pbag.js";
 import { getPHDR } from "./phdr.js";
-import { writeWord } from "../../../utils/byte_functions/little_endian.js";
+import { writeLittleEndian, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo } from "../../../utils/loggin.js";
 /**
  * @typedef {Object} SoundFont2WriteOptions
@@ -72,6 +72,17 @@ export function write(options = DEFAULT_WRITE_OPTIONS)
         this.soundFontInfo["ifil"] = "3.0"; // set version to 3
     }
     
+    if (this.defaultModulators.length > 0)
+    {
+        // trigger the DMOD write
+        this.soundFontInfo["DMOD"] = `${this.defaultModulators.length} Modulators`;
+        this.customDefaultModulators = true;
+    }
+    else
+    {
+        delete this.soundFontInfo["DMOD"];
+    }
+    
     for (const [type, data] of Object.entries(this.soundFontInfo))
     {
         if (type === "ifil" || type === "iver")
@@ -89,10 +100,32 @@ export function write(options = DEFAULT_WRITE_OPTIONS)
         }
         else if (type === "DMOD")
         {
+            
+            const mods = this.defaultModulators;
+            SpessaSynthInfo(
+                `%cWriting %c${mods.length}%c default modulators...`,
+                consoleColors.info,
+                consoleColors.recognized,
+                consoleColors.info
+            );
+            let dmodsize = 10 + mods.length * 10;
+            const dmoddata = new IndexedByteArray(dmodsize);
+            for (const mod of mods)
+            {
+                writeWord(dmoddata, mod.sourceEnum);
+                writeWord(dmoddata, mod.modulatorDestination);
+                writeWord(dmoddata, mod.transformAmount);
+                writeWord(dmoddata, mod.secondarySourceEnum);
+                writeWord(dmoddata, mod.transformType);
+            }
+            
+            // terminal modulator, is zero
+            writeLittleEndian(dmoddata, 0, 10);
+            
             infoArrays.push(writeRIFFChunk(new RiffChunk(
                 type,
-                data.length,
-                data
+                dmoddata.length,
+                dmoddata
             )));
         }
         else

package/src/soundfont/read_sf2/soundfont.js

@@ -87,15 +87,11 @@ export class SoundFont2 extends BasicSoundBank
                     const newModulators = readModulators(chunk);
                     newModulators.pop(); // remove the terminal record
                     text = `Modulators: ${newModulators.length}`;
-                    // override default modulators
-                    const oldDefaults = this.defaultModulators;
                     
+                    // override default modulators
                     this.defaultModulators = newModulators;
-                    this.defaultModulators.push(...oldDefaults.filter(m => !this.defaultModulators.find(mm => Modulator.isIdentical(
-                        m,
-                        mm
-                    ))));
-                    this.soundFontInfo[chunk.header] = chunk.chunkData;
+                    this.customDefaultModulators = true;
+                    this.soundFontInfo[chunk.header] = text;
                     break;
                 
                 default: