spessasynth_lib 3.20.25 → 3.20.26

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.20.25",
-  "description": "MIDI and SoundFont2 or DLS Synthesizer library with no compromises",
+  "version": "3.20.26",
+  "description": "MIDI and SoundFont2/DLS library with no compromises",
   "browser": "index.js",
   "types": "@types/index.d.ts",
   "type": "module",

package/soundfont/basic_soundfont/basic_soundfont.js

@@ -140,18 +140,25 @@ class BasicSoundFont
      */
     getPreset(bankNr, programNr)
     {
+        // check for exact match
         let preset = this.presets.find(p => p.bank === bankNr && p.program === programNr);
         if (!preset)
         {
-            preset = this.presets.find(p => p.program === programNr && p.bank !== 128);
+            // no match...
             if(bankNr === 128)
             {
+                // drum preset: find any preset with bank 128
                 preset = this.presets.find(p => p.bank === 128 && p.program === programNr);
                 if(!preset)
                 {
                     preset = this.presets.find(p => p.bank === 128);
                 }
             }
+            else
+            {
+                // non drum preset: find any preset with the given program that is not a drum preset
+                preset = this.presets.find(p => p.program === programNr && p.bank !== 128);
+            }
             if(preset)
             {
                 SpessaSynthWarn(`%cPreset ${bankNr}.${programNr} not found. Replaced with %c${preset.presetName} (${preset.bank}.${preset.program})`,
@@ -159,6 +166,7 @@ class BasicSoundFont
                     consoleColors.recognized);
             }
         }
+        // no preset, use the first one available
         if(!preset)
         {
             SpessaSynthWarn(`Preset ${programNr} not found. Defaulting to`, this.presets[0].presetName);

package/soundfont/dls/dls_soundfont.js

@@ -48,6 +48,8 @@ class DLSSoundFont extends BasicSoundFont
         this.soundFontInfo["isng"] = "EMU8000";
 
         // set some defaults
+        this.soundFontInfo["INAM"] = "Unnamed DLS";
+        this.soundFontInfo["IENG"] = "Unknown";
         this.soundFontInfo["IPRD"] = "SpessaSynth DLS";
         this.soundFontInfo["ICRD"] =  new Date().toDateString();
 
@@ -61,7 +63,7 @@ class DLSSoundFont extends BasicSoundFont
                 this.soundFontInfo[infoPart.header] = readBytesAsString(infoPart.chunkData, infoPart.size);
             }
         }
-        this.soundFontInfo["ICMT"] = (this.soundFontInfo["ICMT"] || "") + "\nConverted from DLS to SF2 with SpessaSynth";
+        this.soundFontInfo["ICMT"] = (this.soundFontInfo["ICMT"] || "(No description)") + "\nConverted from DLS to SF2 with SpessaSynth";
         if(this.soundFontInfo["ISBJ"])
         {
             // merge it
@@ -101,6 +103,9 @@ class DLSSoundFont extends BasicSoundFont
         }
         this.readDLSInstrumentList(instrumentListChunk);
 
+        // sort presets
+        this.presets.sort((a, b) => (a.program - b.program) + (a.bank - b.bank));
+
         SpessaSynthInfo(`%cParsing finished! %c"${this.soundFontInfo["INAM"] || "UNNAMED"}"%c has %c${this.presets.length} %cpresets,
         %c${this.instruments.length}%c instruments and %c${this.samples.length}%c samples.`,
             consoleColors.info,

package/soundfont/dls/dls_zone.js

@@ -42,6 +42,7 @@ export class DLSZone extends BasicInstrumentZone
         this.isGlobal = false;
 
         // correct tuning if needed
+        samplePitchCorrection -= sample.samplePitchCorrection;
         const coarseTune = Math.trunc(samplePitchCorrection / 100);
         if(coarseTune !== 0)
         {