spessasynth_lib 3.24.28 → 3.24.35

package/synthetizer/worklet_system/main_processor.js

@@ -1,4 +1,3 @@
-import { DEFAULT_PERCUSSION, DEFAULT_SYNTH_MODE, VOICE_CAP } from "../synthetizer.js";
 import { WorkletSequencer } from "../../sequencer/worklet_sequencer/worklet_sequencer.js";
 import { SpessaSynthInfo } from "../../utils/loggin.js";
 import { consoleColors } from "../../utils/other.js";
@@ -28,6 +27,7 @@ import { sendSynthesizerSnapshot } from "./snapshot/send_synthesizer_snapshot.js
 import { applySynthesizerSnapshot } from "./snapshot/apply_synthesizer_snapshot.js";
 import { createWorkletChannel } from "./worklet_methods/create_worklet_channel.js";
 import { FILTER_SMOOTHING_FACTOR } from "./worklet_utilities/lowpass_filter.js";
+import { DEFAULT_PERCUSSION, DEFAULT_SYNTH_MODE, VOICE_CAP } from "../synth_constants.js";
 
 
 /**
@@ -166,7 +166,7 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
     
     /**
      * Overrides the main soundfont (embedded, for example)
-     * @type {BasicSoundFont}
+     * @type {BasicSoundBank}
      */
     overrideSoundfont = undefined;
     

package/synthetizer/worklet_system/worklet_methods/controller_control/controller_change.js

@@ -2,8 +2,8 @@ import { SpessaSynthInfo } from "../../../../utils/loggin.js";
 import { midiControllers } from "../../../../midi_parser/midi_message.js";
 import { computeModulators } from "../../worklet_utilities/worklet_modulator.js";
 import { consoleColors } from "../../../../utils/other.js";
-import { DEFAULT_PERCUSSION } from "../../../synthetizer.js";
 import { channelConfiguration, dataEntryStates } from "../../worklet_utilities/controller_tables.js";
+import { DEFAULT_PERCUSSION } from "../../../synth_constants.js";
 
 /**
  * @param controllerNumber {number}

package/synthetizer/worklet_system/worklet_methods/controller_control/reset_controllers.js

@@ -1,5 +1,4 @@
 import { consoleColors } from "../../../../utils/other.js";
-import { DEFAULT_PERCUSSION, DEFAULT_SYNTH_MODE } from "../../../synthetizer.js";
 import { SpessaSynthInfo } from "../../../../utils/loggin.js";
 import { modulatorSources } from "../../../../soundfont/basic_soundfont/modulator.js";
 import {
@@ -11,6 +10,7 @@ import {
     resetArray
 } from "../../worklet_utilities/controller_tables.js";
 import { midiControllers } from "../../../../midi_parser/midi_message.js";
+import { DEFAULT_PERCUSSION, DEFAULT_SYNTH_MODE } from "../../../synth_constants.js";
 
 
 /**

package/synthetizer/worklet_system/worklet_methods/create_worklet_channel.js

@@ -1,5 +1,6 @@
 import { WorkletProcessorChannel } from "../worklet_utilities/worklet_processor_channel.js";
-import { DEFAULT_PERCUSSION } from "../../synthetizer.js";
+
+import { DEFAULT_PERCUSSION } from "../../synth_constants.js";
 
 /**
  * @param sendEvent {boolean}

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

@@ -5,7 +5,7 @@ import { loadSoundFont } from "../../../../soundfont/load_soundfont.js";
 /**
  * @typedef {Object} SoundFontType
  * @property {string} id - unique id for the soundfont
- * @property {BasicSoundFont} soundfont - the soundfont itself
+ * @property {BasicSoundBank} soundfont - the soundfont itself
  * @property {number} bankOffset - the soundfont's bank offset
  */
 
@@ -245,7 +245,7 @@ export class WorkletSoundfontManager
     {
         this.soundfontList.forEach(s =>
         {
-            s.soundfont.destroySoundfont();
+            s.soundfont.destroySoundBank();
         });
         delete this.soundfontList;
     }

package/synthetizer/worklet_system/worklet_processor.js

@@ -1,7 +1,7 @@
-import { WORKLET_PROCESSOR_NAME } from "../synthetizer.js";
 import { consoleColors } from "../../utils/other.js";
 import { SpessaSynthProcessor } from "./main_processor.js";
 import { SpessaSynthInfo } from "../../utils/loggin.js";
+import { WORKLET_PROCESSOR_NAME } from "../synth_constants.js";
 
 
 // noinspection JSUnresolvedReference

package/soundfont/basic_soundfont/write_sf2/soundfont_trimmer.js

@@ -1,185 +0,0 @@
-import { consoleColors } from "../../../utils/other.js";
-import {
-    SpessaSynthGroup,
-    SpessaSynthGroupCollapsed,
-    SpessaSynthGroupEnd,
-    SpessaSynthInfo
-} from "../../../utils/loggin.js";
-import { getUsedProgramsAndKeys } from "../../../midi_parser/used_keys_loaded.js";
-
-/**
- * @param soundfont {BasicSoundFont}
- * @param mid {BasicMIDI}
- * @returns {Uint8Array}
- */
-export function trimSoundfont(soundfont, mid)
-{
-    /**
-     * @param instrument {Instrument}
-     * @param combos {{key: number, velocity: number}[]}
-     * @returns {number}
-     */
-    function trimInstrumentZones(instrument, combos)
-    {
-        let trimmedIZones = 0;
-        for (let iZoneIndex = 0; iZoneIndex < instrument.instrumentZones.length; iZoneIndex++)
-        {
-            const iZone = instrument.instrumentZones[iZoneIndex];
-            if (iZone.isGlobal)
-            {
-                continue;
-            }
-            const iKeyRange = iZone.keyRange;
-            const iVelRange = iZone.velRange;
-            let isIZoneUsed = false;
-            for (const iCombo of combos)
-            {
-                if (
-                    (iCombo.key >= iKeyRange.min && iCombo.key <= iKeyRange.max) &&
-                    (iCombo.velocity >= iVelRange.min && iCombo.velocity <= iVelRange.max)
-                )
-                {
-                    isIZoneUsed = true;
-                    break;
-                }
-            }
-            if (!isIZoneUsed)
-            {
-                SpessaSynthInfo(
-                    `%c${iZone.sample.sampleName} %cremoved from %c${instrument.instrumentName}%c. Use count: %c${iZone.useCount - 1}`,
-                    consoleColors.recognized,
-                    consoleColors.info,
-                    consoleColors.recognized,
-                    consoleColors.info,
-                    consoleColors.recognized
-                );
-                if (instrument.safeDeleteZone(iZoneIndex))
-                {
-                    trimmedIZones++;
-                    iZoneIndex--;
-                    SpessaSynthInfo(
-                        `%c${iZone.sample.sampleName} %cdeleted`,
-                        consoleColors.recognized,
-                        consoleColors.info
-                    );
-                }
-                if (iZone.sample.useCount < 1)
-                {
-                    soundfont.deleteSample(iZone.sample);
-                }
-            }
-            
-        }
-        return trimmedIZones;
-    }
-    
-    SpessaSynthGroup(
-        "%cTrimming soundfont...",
-        consoleColors.info
-    );
-    const usedProgramsAndKeys = getUsedProgramsAndKeys(mid, soundfont);
-    
-    SpessaSynthGroupCollapsed(
-        "%cModifying soundfont...",
-        consoleColors.info
-    );
-    SpessaSynthInfo("Detected keys for midi:", usedProgramsAndKeys);
-    // modify the soundfont to only include programs and samples that are used
-    for (let presetIndex = 0; presetIndex < soundfont.presets.length; presetIndex++)
-    {
-        const p = soundfont.presets[presetIndex];
-        const string = p.bank + ":" + p.program;
-        const used = usedProgramsAndKeys[string];
-        if (used === undefined)
-        {
-            SpessaSynthInfo(
-                `%cDeleting preset %c${p.presetName}%c and its zones`,
-                consoleColors.info,
-                consoleColors.recognized,
-                consoleColors.info
-            );
-            soundfont.deletePreset(p);
-            presetIndex--;
-        }
-        else
-        {
-            const combos = [...used].map(s =>
-            {
-                const split = s.split("-");
-                return {
-                    key: parseInt(split[0]),
-                    velocity: parseInt(split[1])
-                };
-            });
-            SpessaSynthGroupCollapsed(
-                `%cTrimming %c${p.presetName}`,
-                consoleColors.info,
-                consoleColors.recognized
-            );
-            SpessaSynthInfo(`Keys for ${p.presetName}:`, combos);
-            let trimmedZones = 0;
-            // clean the preset to only use zones that are used
-            for (let zoneIndex = 0; zoneIndex < p.presetZones.length; zoneIndex++)
-            {
-                const zone = p.presetZones[zoneIndex];
-                if (zone.isGlobal)
-                {
-                    continue;
-                }
-                const keyRange = zone.keyRange;
-                const velRange = zone.velRange;
-                // check if any of the combos matches the zone
-                let isZoneUsed = false;
-                for (const combo of combos)
-                {
-                    if (
-                        (combo.key >= keyRange.min && combo.key <= keyRange.max) &&
-                        (combo.velocity >= velRange.min && combo.velocity <= velRange.max)
-                    )
-                    {
-                        // zone is used, trim the instrument zones
-                        isZoneUsed = true;
-                        const trimmedIZones = trimInstrumentZones(zone.instrument, combos);
-                        SpessaSynthInfo(
-                            `%cTrimmed off %c${trimmedIZones}%c zones from %c${zone.instrument.instrumentName}`,
-                            consoleColors.info,
-                            consoleColors.recognized,
-                            consoleColors.info,
-                            consoleColors.recognized
-                        );
-                        break;
-                    }
-                }
-                if (!isZoneUsed)
-                {
-                    trimmedZones++;
-                    p.deleteZone(zoneIndex);
-                    if (zone.instrument.useCount < 1)
-                    {
-                        soundfont.deleteInstrument(zone.instrument);
-                    }
-                    zoneIndex--;
-                }
-            }
-            SpessaSynthInfo(
-                `%cTrimmed off %c${trimmedZones}%c zones from %c${p.presetName}`,
-                consoleColors.info,
-                consoleColors.recognized,
-                consoleColors.info,
-                consoleColors.recognized
-            );
-            SpessaSynthGroupEnd();
-        }
-    }
-    soundfont.removeUnusedElements();
-    
-    soundfont.soundFontInfo["ICMT"] = `NOTE: This soundfont was trimmed by SpessaSynth to only contain presets used in "${mid.midiName}"\n\n`
-        + soundfont.soundFontInfo["ICMT"];
-    
-    SpessaSynthInfo(
-        "%cSoundfont modified!",
-        consoleColors.recognized
-    );
-    SpessaSynthGroupEnd();
-    SpessaSynthGroupEnd();
-}

package/synthetizer/worklet_system/minify_processor.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-cd "$(dirname "$0")" || exit
-esbuild worklet_processor.js --bundle --minify --format=esm --outfile=../worklet_processor.min.js --platform=browser
-echo "Processor minifed succesfully"