spessasynth_lib 3.16.4 → 3.17.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
@@ -31,8 +31,8 @@ export function programChange(channel, programNumber, userChange=false)
     // check if override
     if(this.overrideSoundfont)
     {
-        const bankWithOffset = bank === 128 ? 128 : Math.max(0, bank - this.soundfontBankOffset);
-        const p = this.overrideSoundfont.presets.find(p => p.program === programNumber && p.bank === bankWithOffset);
+        const bankWithOffset = bank === 128 ? 128 : bank - this.soundfontBankOffset;
+        const p = this.overrideSoundfont.getPresetNoFallback(bankWithOffset, programNumber);
         if(p)
         {
             sentBank = bank;
@@ -40,12 +40,6 @@ export function programChange(channel, programNumber, userChange=false)
             channelObject.presetUsesOverride = true;
         }
         else
-        if(this.soundfontBankOffset === 0)
-        {
-            preset = this.overrideSoundfont.getPreset(0, programNumber);
-            sentBank = preset.bank;
-        }
-        else
         {
             preset = this.soundfontManager.getPreset(bank, programNumber);
             sentBank = preset.bank;
@@ -71,24 +65,19 @@ export function programChange(channel, programNumber, userChange=false)
  * @this {SpessaSynthProcessor}
  * @param program {number}
  * @param bank {number}
- * @returns {Preset}
+ * @returns {BasicPreset}
  */
 export function getPreset(bank, program)
 {
     if(this.overrideSoundfont)
     {
         // if overriden soundfont
-        const bankWithOffset = bank === 128 ? 128 : Math.max(0, bank - this.soundfontBankOffset);
-        const preset = this.overrideSoundfont.presets.find(p => p.program === program && p.bank === bankWithOffset);
+        const bankWithOffset = bank === 128 ? 128 : bank - this.soundfontBankOffset;
+        const preset = this.overrideSoundfont.getPresetNoFallback(bankWithOffset, program);
         if(preset)
         {
             return preset;
         }
-        else
-        if(this.soundfontBankOffset === 0)
-        {
-            return this.overrideSoundfont.getPreset(0, program);
-        }
     }
     return this.soundfontManager.getPreset(bank, program);
 }
@@ -97,7 +86,7 @@ export function getPreset(bank, program)
 
 /**
  * @param channel {number}
- * @param preset {Preset}
+ * @param preset {BasicPreset}
  * @this {SpessaSynthProcessor}
  */
 export function setPreset(channel, preset)
@@ -207,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)
@@ -228,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/synthetizer/worklet_system/worklet_utilities/worklet_processor_channel.js

@@ -16,7 +16,7 @@ import { modulatorSources } from '../../../soundfont/read_sf2/modulators.js'
  * @property {number} NRPFine - the current fine value of the Non-Registered Parameter
  * @property {number} RPValue - the current value of the Registered Parameter
  *
- * @property {Preset} preset - the channel's preset
+ * @property {BasicPreset} preset - the channel's preset
  * @property {boolean} lockPreset - indicates whether the program on the channel is locked
  * @property {boolean} presetUsesOverride - indcates if the channel uses a preset from the override soundfont.
  *

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++)
     {