spessasynth_lib 3.25.21 → 3.25.22

package/synthetizer/worklet_wrapper/key_modifier_manager.js

@@ -1,7 +1,7 @@
 import { workletMessageType } from "../audio_engine/message_protocol/worklet_message.js";
-import { KeyModifier, workletKeyModifierMessageType } from "../audio_engine/worklet_methods/worklet_key_modifier.js";
+import { KeyModifier, workletKeyModifierMessageType } from "../audio_engine/engine_components/key_modifier_manager.js";
 
-export class KeyModifierManager
+export class WorkletKeyModifierManagerWrapper
 {
     /**
      * @param synth {Synthetizer}
@@ -42,7 +42,8 @@ export class KeyModifierManager
      *     patch: {
      *         bank: number,
      *         program: number
-     *     }|undefined
+     *     }|undefined,
+     *     gain: number|undefined
      * }} the key's modifiers
      */
     addModifier(channel, midiNote, options)
@@ -50,7 +51,8 @@ export class KeyModifierManager
         const velocity = options?.velocity ?? -1;
         const program = options?.patch?.program ?? -1;
         const bank = options?.patch?.bank ?? -1;
-        const mod = new KeyModifier(velocity, bank, program);
+        const gain = options?.gain ?? 1;
+        const mod = new KeyModifier(velocity, bank, program, gain);
         if (this._keyModifiers[channel] === undefined)
         {
             this._keyModifiers[channel] = [];

package/synthetizer/worklet_wrapper/synth_soundfont_manager.js

@@ -1,7 +1,7 @@
 import { workletMessageType } from "../audio_engine/message_protocol/worklet_message.js";
 import {
     WorkletSoundfontManagerMessageType
-} from "../audio_engine/worklet_methods/worklet_soundfont_manager/sfman_message.js";
+} from "../audio_engine/engine_components/soundfont_manager/sfman_message.js";
 import { SpessaSynthWarn } from "../../utils/loggin.js";
 
 export class SoundfontManager

package/synthetizer/worklet_wrapper/synthetizer.js

@@ -1,24 +1,24 @@
 import { consoleColors } from "../../utils/other.js";
-import { messageTypes, midiControllers } from "../../midi_parser/midi_message.js";
+import { messageTypes, midiControllers } from "../../midi/midi_message.js";
 import { EventHandler } from "./synth_event_handler.js";
 import { FancyChorus } from "../audio_effects/fancy_chorus.js";
 import { getReverbProcessor } from "../audio_effects/reverb.js";
 import {
     ALL_CHANNELS_OR_DIFFERENT_ACTION,
-    masterParameterType,
     returnMessageType,
     workletMessageType
 } from "../audio_engine/message_protocol/worklet_message.js";
 import { SpessaSynthInfo, SpessaSynthWarn } from "../../utils/loggin.js";
 import { DEFAULT_SYNTH_CONFIG } from "../audio_effects/effects_config.js";
 import { SoundfontManager } from "./synth_soundfont_manager.js";
-import { KeyModifierManager } from "./key_modifier_manager.js";
-import { channelConfiguration } from "../audio_engine/worklet_utilities/controller_tables.js";
+import { WorkletKeyModifierManagerWrapper } from "./key_modifier_manager.js";
+import { channelConfiguration } from "../audio_engine/engine_components/controller_tables.js";
 import { DEFAULT_PERCUSSION, DEFAULT_SYNTH_MODE, MIDI_CHANNEL_COUNT, VOICE_CAP } from "../synth_constants.js";
-import { BasicMIDI } from "../../midi_parser/basic_midi.js";
+import { BasicMIDI } from "../../midi/basic_midi.js";
 import { fillWithDefaults } from "../../utils/fill_with_defaults.js";
 import { DEFAULT_SEQUENCER_OPTIONS } from "../../sequencer/worklet_wrapper/default_sequencer_options.js";
 import { WORKLET_PROCESSOR_NAME } from "./worklet_url.js";
+import { masterParameterType } from "../audio_engine/engine_methods/controller_control/master_parameters.js";
 
 
 /**
@@ -199,7 +199,7 @@ export class Synthetizer
         // set up message handling and managers
         this.worklet.port.onmessage = e => this.handleMessage(e.data);
         this.soundfontManager = new SoundfontManager(this);
-        this.keyModifierManager = new KeyModifierManager(this);
+        this.keyModifierManager = new WorkletKeyModifierManagerWrapper(this);
         this._snapshotCallback = undefined;
         this.sequencerCallbackFunction = undefined;
         

package/synthetizer/worklet_wrapper/worklet_processor.js

@@ -3,13 +3,14 @@ import { SpessaSynthInfo, SpessaSynthLogging, SpessaSynthWarn } from "../../util
 import { SpessaSynthProcessor } from "../audio_engine/main_processor.js";
 import {
     ALL_CHANNELS_OR_DIFFERENT_ACTION,
-    masterParameterType,
     returnMessageType,
     workletMessageType
 } from "../audio_engine/message_protocol/worklet_message.js";
 import { SynthesizerSnapshot } from "../audio_engine/snapshot/synthesizer_snapshot.js";
 import { WORKLET_PROCESSOR_NAME } from "./worklet_url.js";
 import { MIDI_CHANNEL_COUNT } from "../synth_constants.js";
+import { workletKeyModifierMessageType } from "../audio_engine/engine_components/key_modifier_manager.js";
+import { masterParameterType } from "../audio_engine/engine_methods/controller_control/master_parameters.js";
 
 
 // a worklet processor wrapper for the synthesizer core
@@ -83,7 +84,7 @@ class WorkletSpessaProcessor extends AudioWorkletProcessor
         const data = message.messageData;
         const channel = message.channelNumber;
         /**
-         * @type {WorkletProcessorChannel}
+         * @type {MidiAudioChannel}
          */
         let channelObject;
         if (channel >= 0)
@@ -177,27 +178,7 @@ class WorkletSpessaProcessor extends AudioWorkletProcessor
                  */
                 const type = data[0];
                 const value = data[1];
-                switch (type)
-                {
-                    case masterParameterType.masterPan:
-                        this.synthesizer.setMasterPan(value);
-                        break;
-                    
-                    case masterParameterType.mainVolume:
-                        this.synthesizer.setMasterGain(value);
-                        break;
-                    
-                    case masterParameterType.voicesCap:
-                        this.synthesizer.voiceCap = value;
-                        break;
-                    
-                    case masterParameterType.interpolationType:
-                        this.synthesizer.interpolationType = value;
-                        break;
-                    
-                    case masterParameterType.midiSystem:
-                        this.synthesizer.setSystem(value);
-                }
+                this.synthesizer.setMasterParameter(type, value);
                 break;
             
             case workletMessageType.setDrums:
@@ -250,7 +231,28 @@ class WorkletSpessaProcessor extends AudioWorkletProcessor
                 break;
             
             case workletMessageType.keyModifierManager:
-                this.synthesizer.keyModifierManager.handleMessage(data[0], data[1]);
+                /**
+                 * @type {workletKeyModifierMessageType}
+                 */
+                const keyMessageType = data[0];
+                const man = this.synthesizer.keyModifierManager;
+                const keyMessageData = data[1];
+                switch (keyMessageType)
+                {
+                    default:
+                        return;
+                    
+                    case workletKeyModifierMessageType.addMapping:
+                        man.addMapping(...keyMessageData);
+                        break;
+                    
+                    case workletKeyModifierMessageType.clearMappings:
+                        man.clearMappings();
+                        break;
+                    
+                    case workletKeyModifierMessageType.deleteMapping:
+                        man.deleteMapping(...keyMessageData);
+                }
                 break;
             
             case workletMessageType.requestSynthesizerSnapshot:

package/synthetizer/audio_engine/worklet_methods/controller_control/master_parameters.js

@@ -1,36 +0,0 @@
-import { SYNTHESIZER_GAIN } from "../../main_processor.js";
-
-/**
- * @param volume {number} 0 to 1
- * @this {SpessaSynthProcessor}
- */
-export function setMIDIVolume(volume)
-{
-    // GM2 specification, section 4.1: master-volume is squared though,
-    // according to my own testing, e seems like a better choice
-    this.midiVolume = Math.pow(volume, Math.E);
-    this.setMasterPan(this.pan);
-}
-
-/**
- * @param volume {number} 0-1
- * @this {SpessaSynthProcessor}
- */
-export function setMasterGain(volume)
-{
-    this.masterGain = volume * SYNTHESIZER_GAIN;
-    this.setMasterPan(this.pan);
-}
-
-/**
- * @param pan {number} -1 to one
- * @this {SpessaSynthProcessor}
- */
-export function setMasterPan(pan)
-{
-    this.pan = pan;
-    // clamp to 0-1 (0 is left)
-    pan = (pan / 2) + 0.5;
-    this.panLeft = (1 - pan);
-    this.panRight = (pan);
-}