spessasynth_lib 3.14.2 → 3.15.0

package/synthetizer/worklet_system/worklet_methods/note_on.js

@@ -38,9 +38,9 @@ export function noteOn(channel, midiNote, velocity, enableDebugging = false, sen
         return;
     }
     const program = channelObject.preset.program;
-    if(this.tunings[program][midiNote]?.midiNote >= 0)
+    if(this.tunings[program]?.[midiNote]?.midiNote >= 0)
     {
-        sentMidiNote = this.tunings[program][midiNote].midiNote;
+        sentMidiNote = this.tunings[program]?.[midiNote].midiNote;
     }
 
     // get voices

package/synthetizer/worklet_system/worklet_methods/program_control.js

@@ -40,6 +40,11 @@ export function programChange(channel, programNumber, userChange=false)
             channelObject.presetUsesOverride = true;
         }
         else
+        if(this.soundfontBankOffset === 0)
+        {
+            preset = this.overrideSoundfont.getPreset(0, programNumber);
+        }
+        else
         {
             preset = this.soundfont.getPreset(bank, programNumber);
             sentBank = preset.bank;
@@ -79,6 +84,11 @@ export function getPreset(bank, program)
         {
             return preset;
         }
+        else
+        if(this.soundfontBankOffset === 0)
+        {
+            return this.overrideSoundfont.getPreset(0, program);
+        }
     }
     return this.soundfont.getPreset(bank, program);
 }
@@ -215,6 +225,10 @@ export function reloadSoundFont(buffer, isOverride = false)
     this.clearSoundFont(false, isOverride);
     if(!isOverride)
     {
+        delete this.soundfont.dataArray;
+        this.soundfont.samples.length = 0;
+        this.soundfont.instruments.length = 0;
+        this.soundfont.presets.length = 0;
         delete this.soundfont;
     }
     try

package/synthetizer/worklet_system/worklet_methods/voice_control.js

@@ -67,7 +67,7 @@ export function renderVoice(
         + channel.customControllers[customControllers.channelTuningSemitones];
 
     // midi tuning standard
-    const tuning = this.tunings[channel.preset.program][targetKey];
+    const tuning = this.tunings[channel.preset.program]?.[targetKey];
     if(tuning?.midiNote >= 0)
     {
         targetKey = tuning.midiNote;

package/synthetizer/worklet_system/worklet_utilities/worklet_voice.js

@@ -65,7 +65,7 @@ export function clearSamplesList()
 
 function /**
  * @param channel {number} channel hint for the processor to recalculate cursor positions
- * @param sample {Sample}
+ * @param sample {LoadedSample}
  * @param id {number}
  * @param sampleDumpCallback {function({channel: number, sampleID: number, sampleData: Float32Array})}
  */
@@ -195,10 +195,16 @@ export function getWorkletVoices(channel,
             }
 
             // determine looping mode now. if the loop is too small, disable
-            const loopStart = (sampleAndGenerators.sample.sampleLoopStartIndex / 2) + (generators[generatorTypes.startloopAddrsOffset] + (generators[generatorTypes.startloopAddrsCoarseOffset] * 32768));
-            const loopEnd = (sampleAndGenerators.sample.sampleLoopEndIndex / 2) + (generators[generatorTypes.endloopAddrsOffset] + (generators[generatorTypes.endloopAddrsCoarseOffset] * 32768));
+            let loopStart = (sampleAndGenerators.sample.sampleLoopStartIndex / 2) + (generators[generatorTypes.startloopAddrsOffset] + (generators[generatorTypes.startloopAddrsCoarseOffset] * 32768));
+            let loopEnd = (sampleAndGenerators.sample.sampleLoopEndIndex / 2) + (generators[generatorTypes.endloopAddrsOffset] + (generators[generatorTypes.endloopAddrsCoarseOffset] * 32768));
             let loopingMode = generators[generatorTypes.sampleModes];
-            if (loopEnd - loopStart < 1) {
+            const sampleLength = sampleAndGenerators.sample.getAudioData().length;
+            // clamp loop
+            loopStart = Math.min(Math.max(0, loopStart), sampleLength);
+            // clamp loop
+            loopEnd = Math.min(Math.max(0, loopEnd), sampleLength);
+            if (loopEnd - loopStart < 1)
+            {
                 loopingMode = 0;
             }
 

package/utils/byte_functions/string.js

@@ -43,7 +43,7 @@ export function readBytesAsString(dataArray, bytes, encoding = undefined, trimEn
     {
         let byteBuffer = dataArray.slice(dataArray.currentIndex, dataArray.currentIndex + bytes)
         dataArray.currentIndex += bytes
-        let decoder = new TextDecoder(encoding)
+        let decoder = new TextDecoder(encoding.replace(/[^\x20-\x7E]/g, ''))
         return decoder.decode(byteBuffer.buffer)
     }
 }