patch name goes here

Fix DLS tuning (again)
Fix DLS presets not being sorted
Fix duplicate presets in soundfont overwriting names
add more defaults
remove "dls conversion" popup when loading from memory

package.json

@@ -1,6 +1,6 @@
 {
   "name": "SpessaSynth",
-  "version": "3.20.25",
+  "version": "3.20.24",
   "type": "module",
   "scripts": {
     "start": "node src/website/server/server.js"

src/spessasynth_lib/soundfont/basic_soundfont/basic_soundfont.js

@@ -140,25 +140,33 @@ 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})`,
                     consoleColors.warn,
                     consoleColors.recognized);
             }
         }
+        // no preset, use the first one available
         if(!preset)
         {
             SpessaSynthWarn(`Preset ${programNr} not found. Defaulting to`, this.presets[0].presetName);

src/spessasynth_lib/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,

src/spessasynth_lib/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)
         {

src/spessasynth_lib/synthetizer/worklet_system/worklet_methods/system_exclusive.js

@@ -259,6 +259,15 @@ export function systemExclusive(messageData, channelOffset = 0)
         // http://www.bandtrax.com.au/sysex.htm
         // https://cdn.roland.com/assets/media/pdf/AT-20R_30R_MI.pdf
         case 0x41:
+            function notRecognized()
+            {
+                // this is some other GS sysex...
+                SpessaSynthWarn(`%cUnrecognized Roland %cGS %cSysEx: %c${arrayToHexString(messageData)}`,
+                    consoleColors.warn,
+                    consoleColors.recognized,
+                    consoleColors.warn,
+                    consoleColors.unrecognized);
+            }
             if(messageData[2] === 0x42 && messageData[3] === 0x12)
             {
                 // this is a GS sysex
@@ -294,6 +303,8 @@ export function systemExclusive(messageData, channelOffset = 0)
                         switch (messageData[6])
                         {
                             default:
+                                // this is some other GS sysex...
+                                notRecognized();
                                 break;
 
                             case 0x15:
@@ -340,15 +351,17 @@ export function systemExclusive(messageData, channelOffset = 0)
                             case 0x4B:
                                 // scale tuning
                                 const cents = messageValue - 64;
-                                SpessaSynthInfo(`%cChannel %c${channel}%c tuning. Cents %c${cents}%c, with %c${arrayToHexString(messageData)}`,
+                                SpessaSynthInfo(`%cChannel %c${channel}%c scale tuning. Cents %c${cents}%c, with %c${arrayToHexString(messageData)}`,
                                     consoleColors.info,
                                     consoleColors.recognized,
                                     consoleColors.info,
                                     consoleColors.value,
                                     consoleColors.info,
                                     consoleColors.value);
                                 this.setChannelTuning(channel, cents);
+                            break;
                         }
+                        return;
                     }
                     else
                     // this is a global system parameter
@@ -390,11 +403,7 @@ export function systemExclusive(messageData, channelOffset = 0)
                     }
                 }
                 // this is some other GS sysex...
-                SpessaSynthWarn(`%cUnrecognized Roland %cGS %cSysEx: %c${arrayToHexString(messageData)}`,
-                    consoleColors.warn,
-                    consoleColors.recognized,
-                    consoleColors.warn,
-                    consoleColors.unrecognized);
+                notRecognized();
                 return;
             }
             else

src/spessasynth_lib/synthetizer/worklet_system/worklet_methods/worklet_soundfont_manager/worklet_soundfont_manager.js

@@ -48,9 +48,20 @@ export class WorkletSoundfontManager
         for (let i = this.soundfontList.length - 1; i >= 0; i--)
         {
             const font = this.soundfontList[i];
+            /**
+             * prevent preset names from the same soudfont from being overriden
+             * if the soundfont has two presets with matching bank and program
+             * @type {Set<string>}
+             */
+            const presets = new Set();
             for(const p of font.soundfont.presets)
             {
                 const presetString = `${p.bank + font.bankOffset}-${p.program}`;
+                if(presets.has(presetString))
+                {
+                    continue;
+                }
+                presets.add(presetString);
                 presetList[presetString] = p.presetName;
             }
         }

src/website/manager/manager.js

@@ -78,6 +78,9 @@ class Manager
     saveBlob(blob, name)
     {
         const url = URL.createObjectURL(blob);
+        /**
+         * @type {HTMLAnchorElement}
+         */
         const a = document.createElement("a");
         a.href = url;
         a.download = name;
@@ -174,7 +177,10 @@ class Manager
         // set up keyboard
         this.keyboard = new MidiKeyboard(this.channelColors, this.synth);
 
-        // set up renderer
+        /**
+         * set up renderer
+         * @type {HTMLCanvasElement}
+         */
         const canvas = document.getElementById("note_canvas");
 
         canvas.width = window.innerWidth * window.devicePixelRatio;
@@ -279,6 +285,9 @@ class Manager
                     if (videoSource === null) {
                         return;
                     }
+                    /**
+                     * @type {HTMLVideoElement}
+                     */
                     const video = document.createElement("video");
                     video.src = videoSource;
                     video.classList.add("secret_video");
@@ -309,9 +318,6 @@ class Manager
             }
         });
         this.renderer.render(false, true);
-        setTimeout(() => {
-            this.doDLSCheck()
-        }, 1000);
     }
 
     doDLSCheck()