spessasynth_core 3.26.16 → 3.26.17

package/package.json

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

package/src/soundfont/basic_soundfont/modulator.js

@@ -32,18 +32,6 @@ export class Modulator
      */
     currentValue = 0;
     
-    /**
-     * The source enumeration for this modulator
-     * @type {number}
-     */
-    sourceEnum;
-    
-    /**
-     * The secondary source enumeration for this modulator
-     * @type {number}
-     */
-    secondarySourceEnum;
-    
     /**
      * The generator destination of this modulator
      * @type {generatorTypes}
@@ -72,9 +60,9 @@ export class Modulator
      */
     constructor(srcEnum, secSrcEnum, destination, amount, transformType)
     {
-        this.sourceEnum = srcEnum;
+        const sourceEnum = srcEnum;
         this.modulatorDestination = destination;
-        this.secondarySourceEnum = secSrcEnum;
+        const secondarySourceEnum = secSrcEnum;
         this.transformAmount = amount;
         this.transformType = transformType;
         
@@ -85,18 +73,18 @@ export class Modulator
         }
         
         // decode the source
-        this.sourcePolarity = this.sourceEnum >> 9 & 1;
-        this.sourceDirection = this.sourceEnum >> 8 & 1;
-        this.sourceUsesCC = this.sourceEnum >> 7 & 1;
-        this.sourceIndex = this.sourceEnum & 127;
-        this.sourceCurveType = this.sourceEnum >> 10 & 3;
+        this.sourcePolarity = sourceEnum >> 9 & 1;
+        this.sourceDirection = sourceEnum >> 8 & 1;
+        this.sourceUsesCC = sourceEnum >> 7 & 1;
+        this.sourceIndex = sourceEnum & 127;
+        this.sourceCurveType = sourceEnum >> 10 & 3;
         
         // decode the secondary source
-        this.secSrcPolarity = this.secondarySourceEnum >> 9 & 1;
-        this.secSrcDirection = this.secondarySourceEnum >> 8 & 1;
-        this.secSrcUsesCC = this.secondarySourceEnum >> 7 & 1;
-        this.secSrcIndex = this.secondarySourceEnum & 127;
-        this.secSrcCurveType = this.secondarySourceEnum >> 10 & 3;
+        this.secSrcPolarity = secondarySourceEnum >> 9 & 1;
+        this.secSrcDirection = secondarySourceEnum >> 8 & 1;
+        this.secSrcUsesCC = secondarySourceEnum >> 7 & 1;
+        this.secSrcIndex = secondarySourceEnum & 127;
+        this.secSrcCurveType = secondarySourceEnum >> 10 & 3;
         
         /**
          * Indicates if the given modulator is chorus or reverb effects modulator.
@@ -111,10 +99,10 @@ export class Modulator
          */
         this.isEffectModulator =
             (
-                this.sourceEnum === 0x00DB
-                || this.sourceEnum === 0x00DD
+                sourceEnum === 0x00DB
+                || sourceEnum === 0x00DD
             )
-            && this.secondarySourceEnum === 0x0
+            && secondarySourceEnum === 0x0
             && (
                 this.modulatorDestination === generatorTypes.reverbEffectsSend
                 || this.modulatorDestination === generatorTypes.chorusEffectsSend
@@ -128,8 +116,8 @@ export class Modulator
     static copy(modulator)
     {
         return new Modulator(
-            modulator.sourceEnum,
-            modulator.secondarySourceEnum,
+            modulator.getSourceEnum(),
+            modulator.getSecSrcEnum(),
             modulator.modulatorDestination,
             modulator.transformAmount,
             modulator.transformType
@@ -144,9 +132,19 @@ export class Modulator
      */
     static isIdentical(mod1, mod2, checkAmount = false)
     {
-        return (mod1.sourceEnum === mod2.sourceEnum)
+        return (mod1.sourceIndex === mod2.sourceIndex)
+            && (mod1.sourceUsesCC === mod2.sourceUsesCC)
+            && (mod1.sourcePolarity === mod2.sourcePolarity)
+            && (mod1.sourceDirection === mod2.sourceDirection)
+            && (mod1.sourceCurveType === mod2.sourceCurveType)
+            
+            && (mod1.secSrcIndex === mod2.secSrcIndex)
+            && (mod1.secSrcUsesCC === mod2.secSrcUsesCC)
+            && (mod1.secSrcPolarity === mod2.secSrcPolarity)
+            && (mod1.secSrcDirection === mod2.secSrcDirection)
+            && (mod1.secSrcCurveType === mod2.secSrcCurveType)
+            
             && (mod1.modulatorDestination === mod2.modulatorDestination)
-            && (mod1.secondarySourceEnum === mod2.secondarySourceEnum)
             && (mod1.transformType === mod2.transformType)
             && (!checkAmount || (mod1.transformAmount === mod2.transformAmount));
     }
@@ -194,6 +192,28 @@ export class Modulator
         \n\n`;
     }
     
+    getSourceEnum()
+    {
+        return getModSourceEnum(
+            this.sourceCurveType,
+            this.sourcePolarity,
+            this.sourceDirection,
+            this.sourceUsesCC,
+            this.sourceIndex
+        );
+    }
+    
+    getSecSrcEnum()
+    {
+        return getModSourceEnum(
+            this.secSrcCurveType,
+            this.secSrcPolarity,
+            this.secSrcDirection,
+            this.secSrcUsesCC,
+            this.secSrcIndex
+        );
+    }
+    
     /**
      * Sum transform and create a NEW modulator
      * @param modulator {Modulator}
@@ -202,8 +222,8 @@ export class Modulator
     sumTransform(modulator)
     {
         return new Modulator(
-            this.sourceEnum,
-            this.secondarySourceEnum,
+            this.getSourceEnum(),
+            this.getSecSrcEnum(),
             this.modulatorDestination,
             this.transformAmount + modulator.transformAmount,
             this.transformType

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

@@ -16,8 +16,16 @@ export function getIBAG()
     let modulatorIndex = 0;
     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])
+        {
+            zones.unshift(global?.[0]);
+        }
         inst.instrumentZoneIndex = zoneID;
-        for (const ibag of inst.instrumentZones)
+        for (const ibag of zones)
         {
             ibag.zoneID = zoneID;
             writeWord(ibagdata, generatorIndex);

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

@@ -24,7 +24,7 @@ export function getIGEN()
             );
             // add sample and ranges if necessary
             // unshift vel then key (to make key first) and the instrument is last
-            if (z.velRange.max !== 127 || z.velRange.min !== 0)
+            if (z.hasVelRange)
             {
                 z.generators.unshift(new Generator(
                     generatorTypes.velRange,
@@ -32,7 +32,7 @@ export function getIGEN()
                     false
                 ));
             }
-            if (z.keyRange.max !== 127 || z.keyRange.min !== 0)
+            if (z.hasKeyRange)
             {
                 z.generators.unshift(new Generator(
                     generatorTypes.keyRange,

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

@@ -25,10 +25,10 @@ export function getIMOD()
             ibag.modulatorZoneStartIndex = imodIndex;
             for (const mod of ibag.modulators)
             {
-                writeWord(imoddata, mod.sourceEnum);
+                writeWord(imoddata, mod.getSourceEnum());
                 writeWord(imoddata, mod.modulatorDestination);
                 writeWord(imoddata, mod.transformAmount);
-                writeWord(imoddata, mod.secondarySourceEnum);
+                writeWord(imoddata, mod.getSecSrcEnum());
                 writeWord(imoddata, mod.transformType);
                 imodIndex++;
             }

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

@@ -16,8 +16,16 @@ export function getPBAG()
     let modulatorIndex = 0;
     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 preset.presetZones)
+        for (const pbag of zones)
         {
             pbag.zoneID = zoneID;
             writeWord(pbagdata, generatorIndex);

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

@@ -24,7 +24,7 @@ export function getPGEN()
                 g.generatorType !== generatorTypes.velRange
             );
             // unshift vel then key and instrument is last
-            if (z.velRange.max !== 127 || z.velRange.min !== 0)
+            if (z.hasVelRange)
             {
                 z.generators.unshift(new Generator(
                     generatorTypes.velRange,
@@ -32,7 +32,7 @@ export function getPGEN()
                     false
                 ));
             }
-            if (z.keyRange.max !== 127 || z.keyRange.min !== 0)
+            if (z.hasKeyRange)
             {
                 z.generators.unshift(new Generator(
                     generatorTypes.keyRange,

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

@@ -25,10 +25,10 @@ export function getPMOD()
             pbag.modulatorZoneStartIndex = pmodIndex;
             for (const mod of pbag.modulators)
             {
-                writeWord(pmoddata, mod.sourceEnum);
+                writeWord(pmoddata, mod.getSourceEnum());
                 writeWord(pmoddata, mod.modulatorDestination);
                 writeWord(pmoddata, mod.transformAmount);
-                writeWord(pmoddata, mod.secondarySourceEnum);
+                writeWord(pmoddata, mod.getSecSrcEnum());
                 writeWord(pmoddata, mod.transformType);
                 pmodIndex++;
             }

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

@@ -112,10 +112,10 @@ export function write(options = DEFAULT_WRITE_OPTIONS)
             const dmoddata = new IndexedByteArray(dmodsize);
             for (const mod of mods)
             {
-                writeWord(dmoddata, mod.sourceEnum);
+                writeWord(dmoddata, mod.getSourceEnum());
                 writeWord(dmoddata, mod.modulatorDestination);
                 writeWord(dmoddata, mod.transformAmount);
-                writeWord(dmoddata, mod.secondarySourceEnum);
+                writeWord(dmoddata, mod.getSecSrcEnum());
                 writeWord(dmoddata, mod.transformType);
             }