spessasynth_core 3.26.40 → 3.26.42

package/package.json

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

package/src/soundfont/basic_soundfont/basic_instrument.js

@@ -97,13 +97,14 @@ export class BasicInstrument
     
     /**
      * @param index {number}
+     * @param force {boolean} ignore use count
      * @returns {boolean} if deleted
      */
-    deleteZone(index)
+    deleteZone(index, force = false)
     {
         const zone = this.instrumentZones[index];
         zone.useCount -= 1;
-        if (zone.useCount < 1)
+        if (zone.useCount < 1 || force)
         {
             zone.deleteZone();
             this.instrumentZones.splice(index, 1);

package/src/soundfont/basic_soundfont/basic_sample.js

@@ -271,6 +271,11 @@ export class BasicSample
      */
     setLinkedSample(sample, type)
     {
+        // sanity check
+        if (sample.linkedSample)
+        {
+            throw new Error(`${sample.sampleName} is linked tp ${sample.linkedSample.sampleName}. Unlink it first.`);
+        }
         this.linkedSample = sample;
         sample.linkedSample = this;
         if (type === sampleTypes.leftSample)

package/src/soundfont/basic_soundfont/basic_soundbank.js

@@ -263,7 +263,11 @@ class BasicSoundBank
         if (sample.linkedSample)
         {
             const clonedLinked = this.cloneSample(sample.linkedSample);
-            newSample.setLinkedSample(clonedLinked, newSample.sampleType);
+            // sanity check
+            if (!clonedLinked.linkedSample)
+            {
+                newSample.setLinkedSample(clonedLinked, newSample.sampleType);
+            }
         }
         return newSample;
     }

package/src/soundfont/read_sf2/samples.js

@@ -3,7 +3,7 @@ import { IndexedByteArray } from "../../utils/indexed_array.js";
 import { readLittleEndian, signedInt8 } from "../../utils/byte_functions/little_endian.js";
 import { SpessaSynthInfo, SpessaSynthWarn } from "../../utils/loggin.js";
 import { readBytesAsString } from "../../utils/byte_functions/string.js";
-import { BasicSample, sampleTypes } from "../basic_soundfont/basic_sample.js";
+import { BasicSample } from "../basic_soundfont/basic_sample.js";
 import { consoleColors } from "../../utils/other.js";
 
 /**
@@ -130,16 +130,28 @@ export class SoundFontSample extends BasicSample
         {
             return;
         }
-        const linkedSample = samplesArray[this.linkedSampleIndex];
-        if (!linkedSample)
+        const linked = samplesArray[this.linkedSampleIndex];
+        if (!linked)
         {
             // log as info because it's common and not really dangerous
             SpessaSynthInfo(`%cInvalid linked sample for ${this.sampleName}. Setting to mono.`, consoleColors.warn);
-            this.setSampleType(sampleTypes.monoSample);
+            this.unlinkSample();
         }
         else
         {
-            this.setLinkedSample(samplesArray[this.linkedSampleIndex], this.sampleType);
+            // check for corrupted files (like FluidR3_GM.sf2 that link EVERYTHING to a single sample)
+            if (linked.linkedSample)
+            {
+                SpessaSynthInfo(
+                    `%cInvalid linked sample for ${this.sampleName}: Already linked to ${linked.linkedSample.sampleName}`,
+                    consoleColors.warn
+                );
+                this.unlinkSample();
+            }
+            else
+            {
+                this.setLinkedSample(linked, this.sampleType);
+            }
         }
     }