spessasynth_lib 3.16.5 → 3.20.0

package/synthetizer/worklet_system/main_processor.js

@@ -1,5 +1,4 @@
 import { DEFAULT_PERCUSSION, DEFAULT_SYNTH_MODE, VOICE_CAP } from '../synthetizer.js'
-import { SoundFont2 } from '../../soundfont/soundfont.js'
 import { WorkletSequencer } from '../../sequencer/worklet_sequencer/worklet_sequencer.js'
 import { SpessaSynthInfo } from '../../utils/loggin.js'
 import { consoleColors } from '../../utils/other.js'
@@ -134,7 +133,7 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
 
         /**
          * Overrides the main soundfont (embedded for example
-         * @type {SoundFont2}
+         * @type {BasicSoundFont}
          */
         this.overrideSoundfont = undefined;
 

package/synthetizer/worklet_system/worklet_methods/program_control.js

@@ -1,10 +1,10 @@
 import { midiControllers } from '../../../midi_parser/midi_message.js'
-import { SoundFont2 } from '../../../soundfont/soundfont.js'
 import { clearSamplesList } from '../worklet_utilities/worklet_voice.js'
 import { generatorTypes } from '../../../soundfont/read_sf2/generators.js'
 import { returnMessageType } from '../message_protocol/worklet_message.js'
 import { SpessaSynthInfo } from '../../../utils/loggin.js'
 import { consoleColors } from '../../../utils/other.js'
+import { loadSoundFont } from '../../../soundfont/load_soundfont.js'
 
 /**
  * executes a program change
@@ -196,7 +196,10 @@ export function clearSoundFont(sendPresets = true, clearOverride = true)
         {
             channelObject.cachedVoices.push([]);
         }
-        channelObject.lockPreset = false;
+        if(!clearOverride)
+        {
+            channelObject.lockPreset = false;
+        }
         this.programChange(i, channelObject.preset.program);
     }
     if(sendPresets)
@@ -217,7 +220,7 @@ export function reloadSoundFont(buffer, isOverride = false)
     {
         if(isOverride)
         {
-            this.overrideSoundfont = new SoundFont2(buffer);
+            this.overrideSoundfont = loadSoundFont(buffer);
             // assign sample offset
             this.overrideSoundfont.setSampleIDOffset(this.soundfontManager.totalSoundfontOffset)
         }

package/synthetizer/worklet_system/worklet_methods/worklet_soundfont_manager/worklet_soundfont_manager.js

@@ -1,11 +1,11 @@
-import { SoundFont2 } from '../../../../soundfont/soundfont.js'
 import { SpessaSynthWarn } from '../../../../utils/loggin.js'
 import { WorkletSoundfontManagerMessageType } from './sfman_message.js'
+import { loadSoundFont } from '../../../../soundfont/load_soundfont.js'
 
 /**
  * @typedef {Object} SoundFontType
  * @property {string} id - unique id for the soundfont
- * @property {SoundFont2} soundfont - the soundfont itself
+ * @property {BasicSoundFont} soundfont - the soundfont itself
  * @property {number} bankOffset - the soundfont's bank offset
  */
 
@@ -110,7 +110,7 @@ export class WorkletSoundfontManager
      */
     reloadManager(soundFontArrayBuffer)
     {
-        const font =  new SoundFont2(soundFontArrayBuffer);
+        const font =  loadSoundFont(soundFontArrayBuffer);
         /**
          * All the soundfonts, ordered from the most important to the least.
          * @type {SoundFontType[]}
@@ -159,7 +159,7 @@ export class WorkletSoundfontManager
         }
         this.soundfontList.push({
             id: id,
-            soundfont: new SoundFont2(buffer),
+            soundfont: loadSoundFont(buffer),
             bankOffset: bankOffset
         });
         this.generatePresetList();
@@ -182,7 +182,7 @@ export class WorkletSoundfontManager
      * Gets a given preset from the soundfont stack
      * @param bankNumber {number}
      * @param programNumber {number}
-     * @returns {Preset} the preset
+     * @returns {BasicPreset} the preset
      */
     getPreset(bankNumber, programNumber)
     {

package/utils/buffer_to_wav.js

@@ -113,39 +113,18 @@ export function audioBufferToWav(audioBuffer, normalizeAudio = true, channelOffs
     wavData.set(header, 0);
 
     // Interleave audio data (combine channels)
-    let multiplier;
+    let multiplier = 32767;
     if(normalizeAudio)
     {
         // find min and max values to prevent clipping when converting to 16 bits
-        const initialMultiplier = 32767;
-
-        const max = Math.max(
-            channel1Data.reduce((max, value) => (value > max ? value : max), -Infinity),
-            channel2Data.reduce((max, value) => (value > max ? value : max), -Infinity)
-        );
-
-        const min = Math.min(
-            channel1Data.reduce((min, value) => (value < min ? value : min), Infinity),
-            channel2Data.reduce((min, value) => (value < min ? value : min), Infinity)
-        );
-        const maxAbsValue = Math.max(max, Math.abs(min));
-        multiplier = initialMultiplier / maxAbsValue;
-    }
-    else
-    {
-        multiplier = 32767;
-        // clip audio
-        for(let i = 0; i < length; i++)
-        {
-            channel1Data[i] = Math.min(1, Math.max(-1, channel1Data[i]));
-            channel2Data[i] = Math.min(1, Math.max(-1, channel2Data[i]));
-        }
+        const maxAbsValue = channel1Data.map((v, i) => Math.max(Math.abs(v), Math.abs(channel2Data[i]))).reduce( (a,b) => Math.max(a,b))
+        multiplier = maxAbsValue > 0 ? (32767 / maxAbsValue) : 1;
     }
     for (let i = 0; i < length; i++)
     {
         // interleave both channels
-        const sample1 = channel1Data[i] * multiplier;
-        const sample2 = channel2Data[i] * multiplier;
+        const sample1 = Math.min(1, Math.max(-1, channel1Data[i])) * multiplier;
+        const sample2 = Math.min(1, Math.max(-1,channel2Data[i])) * multiplier;
 
         // convert to 16-bit
         wavData[offset++] = sample1 & 0xff;

package/utils/byte_functions/little_endian.js

@@ -4,7 +4,7 @@
  * @param bytesAmount {number}
  * @returns {number}
  */
-export function readBytesAsUintLittleEndian(dataArray, bytesAmount){
+export function readLittleEndian(dataArray, bytesAmount){
     let out = 0;
     for(let i = 0; i < bytesAmount; i++)
     {