spessasynth_core 3.26.26 → 3.26.28

package/package.json

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

package/src/midi/xmf_loader.js

@@ -350,7 +350,7 @@ class XMFNode
 }
 
 /**
- * @param midi {MIDI}
+ * @param midi {BasicMIDI}
  * @param binaryData {IndexedByteArray}
  * @returns {IndexedByteArray} the file byte array
  */

package/src/soundfont/basic_soundfont/basic_instrument.js

@@ -69,8 +69,12 @@ export class BasicInstrument
         this.linkedPresets.splice(index, 1);
     }
     
-    deleteAllZones()
+    deleteInstrument()
     {
+        if (this.useCount > 0)
+        {
+            throw new Error(`Cannot delete an instrument that has ${this.useCount} usages.`);
+        }
         this.instrumentZones.forEach(z => z.deleteZone());
         this.instrumentZones.length = 0;
     }

package/src/soundfont/basic_soundfont/basic_sample.js

@@ -246,6 +246,15 @@ export class BasicSample
         
     }
     
+    deleteSample()
+    {
+        if (this.useCount > 0)
+        {
+            throw new Error(`Cannot delete sample that has ${this.useCount} usages.`);
+        }
+        this.unlinkSample();
+    }
+    
     // noinspection JSUnusedGlobalSymbols
     /**
      * Unlinks a sample link

package/src/soundfont/basic_soundfont/basic_soundbank.js

@@ -149,7 +149,6 @@ class BasicSoundBank
             20,
             0,
             0,
-            0,
             127
         );
         sample.sampleData = new Float32Array(128);
@@ -443,15 +442,24 @@ class BasicSoundBank
     
     removeUnusedElements()
     {
-        this.instruments.forEach(i =>
+        this.instruments = this.instruments.filter(i =>
+        {
+            const deletable = i.useCount < 1;
+            if (deletable)
+            {
+                i.deleteInstrument();
+            }
+            return deletable;
+        });
+        this.samples = this.samples.filter(s =>
         {
-            if (i.useCount < 1)
+            const deletable = s.useCount < 1;
+            if (deletable)
             {
-                i.deleteAllZones();
+                s.deleteSample();
             }
+            return deletable;
         });
-        this.instruments = this.instruments.filter(i => i.useCount > 0);
-        this.samples = this.samples.filter(s => s.useCount > 0);
     }
     
     /**
@@ -459,12 +467,8 @@ class BasicSoundBank
      */
     deleteInstrument(instrument)
     {
-        if (instrument.useCount > 0)
-        {
-            throw new Error(`Cannot delete an instrument that has ${instrument.useCount} usages.`);
-        }
+        instrument.deleteInstrument();
         this.instruments.splice(this.instruments.indexOf(instrument), 1);
-        instrument.deleteAllZones();
     }
     
     /**
@@ -481,10 +485,7 @@ class BasicSoundBank
      */
     deleteSample(sample)
     {
-        if (sample.useCount > 0)
-        {
-            throw new Error(`Cannot delete sample that has ${sample.useCount} usages.`);
-        }
+        sample.deleteSample();
         this.samples.splice(this.samples.indexOf(sample), 1);
     }
     
@@ -616,6 +617,7 @@ class BasicSoundBank
         delete this.presets;
         delete this.instruments;
         delete this.samples;
+        delete this.soundFontInfo;
     }
 }
 

package/src/soundfont/dls/dls_sample.js

@@ -1,4 +1,4 @@
-import { BasicSample } from "../basic_soundfont/basic_sample.js";
+import { BasicSample, sampleTypes } from "../basic_soundfont/basic_sample.js";
 
 export class DLSSample extends BasicSample
 {
@@ -38,12 +38,11 @@ export class DLSSample extends BasicSample
             rate,
             pitch,
             pitchCorrection,
-            0,
-            1,
+            sampleTypes.monoSample,
             loopStart,
             loopEnd
         );
-        this.sampleData = data;
+        this.setAudioData(data);
         this.sampleDbAttenuation = sampleDbAttenuation;
     }
     

package/src/utils/indexed_array.js

@@ -27,7 +27,7 @@ export class IndexedByteArray extends Uint8Array
      */
     slice(start, end)
     {
-        const a = super.slice(start, end);
+        const a = /** @type {IndexedByteArray} */ super.slice(start, end);
         a.currentIndex = 0;
         return a;
     }