spessasynth_core 3.26.27 → 3.26.28

package/package.json

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

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

@@ -442,15 +442,24 @@ class BasicSoundBank
     
     removeUnusedElements()
     {
-        this.instruments.forEach(i =>
+        this.instruments = this.instruments.filter(i =>
         {
-            if (i.useCount < 1)
+            const deletable = i.useCount < 1;
+            if (deletable)
             {
-                i.deleteAllZones();
+                i.deleteInstrument();
             }
+            return deletable;
+        });
+        this.samples = this.samples.filter(s =>
+        {
+            const deletable = s.useCount < 1;
+            if (deletable)
+            {
+                s.deleteSample();
+            }
+            return deletable;
         });
-        this.instruments = this.instruments.filter(i => i.useCount > 0);
-        this.samples = this.samples.filter(s => s.useCount > 0);
     }
     
     /**
@@ -458,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();
     }
     
     /**
@@ -480,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);
     }
     
@@ -615,6 +617,7 @@ class BasicSoundBank
         delete this.presets;
         delete this.instruments;
         delete this.samples;
+        delete this.soundFontInfo;
     }
 }