fix putting MIDI program change before cc reset

fix snapshot not applying after loading embedded soundfont

package.json

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

src/spessasynth_lib/midi_parser/midi_editor.js

@@ -296,7 +296,7 @@ export function modifyMIDI(
         /**
          * @type {{index: number, track: number}[]}
          */
-        const firstNoteOnForTrack = getFirstVoiceForChannel(midiChannel, port, offset > 0);
+        const firstNoteOnForTrack = getFirstVoiceForChannel(midiChannel, port, true);
         if(firstNoteOnForTrack.length === 0)
         {
             SpessaSynthWarn("Program change but no notes... ignoring!");

src/spessasynth_lib/sequencer/worklet_sequencer/song_control.js

@@ -57,11 +57,7 @@ export function loadNewSequence(parsedMidi)
     if(this.midiData.embeddedSoundFont !== undefined)
     {
         SpessaSynthInfo("%cEmbedded soundfont detected! Using it.", consoleColors.recognized);
-        // set offet
-        this.synth.soundfontBankOffset = this.midiData.bankOffset;
-        this.synth.reloadSoundFont(this.midiData.embeddedSoundFont, true);
-        // preload all samples
-        this.synth.overrideSoundfont.samples.forEach(s => s.getAudioData());
+        this.synth.setEmbeddedSoundFont(this.midiData.embeddedSoundFont, this.midiData.bankOffset);
     }
     else
     {

src/spessasynth_lib/synthetizer/worklet_system/main_processor.js

@@ -33,7 +33,7 @@ import {
     getPreset,
     programChange,
     reloadSoundFont, sampleDump, sendPresetList,
-    setDrums,
+    setDrums, setEmbeddedSoundFont,
     setPreset,
 } from './worklet_methods/program_control.js'
 import { applySynthesizerSnapshot, sendSynthesizerSnapshot } from './worklet_methods/snapshot.js'
@@ -204,14 +204,21 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
 
         this.totalVoicesAmount = 0;
 
+        /**
+         * The snapshot that synth was restored from
+         * @type {SynthesizerSnapshot|undefined}
+         * @private
+         */
+        this._snapshot = options.processorOptions?.startRenderingData?.snapshot;
+
         this.port.onmessage = e => this.handleMessage(e.data);
 
         // if sent, start rendering
         if(options.processorOptions.startRenderingData)
         {
-            if (options.processorOptions.startRenderingData.snapshot)
+            if (this._snapshot !== undefined)
             {
-                this.applySynthesizerSnapshot(options.processorOptions.startRenderingData.snapshot);
+                this.applySynthesizerSnapshot(this._snapshot);
                 this.resetAllControllers();
             }
 
@@ -411,6 +418,7 @@ SpessaSynthProcessor.prototype.setPreset = setPreset;
 SpessaSynthProcessor.prototype.setDrums = setDrums;
 SpessaSynthProcessor.prototype.reloadSoundFont = reloadSoundFont;
 SpessaSynthProcessor.prototype.clearSoundFont = clearSoundFont;
+SpessaSynthProcessor.prototype.setEmbeddedSoundFont = setEmbeddedSoundFont;
 SpessaSynthProcessor.prototype.sampleDump = sampleDump;
 SpessaSynthProcessor.prototype.sendPresetList = sendPresetList;
 

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

@@ -252,6 +252,28 @@ export function reloadSoundFont(buffer, isOverride = false)
     SpessaSynthInfo("%cSpessaSynth is ready!", consoleColors.recognized);
 }
 
+/**
+ * Sets the embedded (RMI soundfont)
+ * @param font {ArrayBuffer}
+ * @param offset {number}
+ * @this {SpessaSynthProcessor}
+ */
+export function setEmbeddedSoundFont(font, offset)
+{
+    // set offet
+    this.soundfontBankOffset = offset;
+    this.reloadSoundFont(font, true);
+    // preload all samples
+    this.overrideSoundfont.samples.forEach(s => s.getAudioData());
+
+    // apply snapshot again if applicable
+    if(this._snapshot !== undefined)
+    {
+        this.applySynthesizerSnapshot(this._snapshot);
+        this.resetAllControllers();
+    }
+}
+
 /**
  * saves a sample
  * @param channel {number}

start.bat

@@ -1 +1,2 @@
+git pull
 node src/website/server/server.js