spessasynth_lib 3.25.7 → 3.25.9

package/synthetizer/worklet_system/main_processor.js

@@ -10,7 +10,7 @@ import {
 import { stbvorbis } from "../../externals/stbvorbis_sync/stbvorbis_sync.min.js";
 import { VOLUME_ENVELOPE_SMOOTHING_FACTOR } from "./worklet_utilities/volume_envelope.js";
 import { handleMessage } from "./message_protocol/handle_message.js";
-import { callEvent, sendChannelProperties } from "./message_protocol/message_sending.js";
+import { callEvent } from "./message_protocol/message_sending.js";
 import { systemExclusive } from "./worklet_methods/system_exclusive.js";
 import { setMasterGain, setMasterPan, setMIDIVolume } from "./worklet_methods/controller_control/master_parameters.js";
 import { resetAllControllers } from "./worklet_methods/controller_control/reset_controllers.js";
@@ -437,7 +437,7 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
         this.sequencer.processTick();
         
         // for every channel
-        let totalCurrentVoices = 0;
+        this.totalVoicesAmount = 0;
         this.workletProcessorChannels.forEach((channel, index) =>
         {
             if (channel.voices.length < 1 || channel.isMuted)
@@ -445,6 +445,7 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
                 // skip the channels
                 return;
             }
+            let voiceCount = channel.voices.length;
             let outputIndex;
             let outputL;
             let outputR;
@@ -480,15 +481,14 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
                 chorusL, chorusR
             );
             
-            totalCurrentVoices += channel.voices.length;
+            this.totalVoicesAmount += channel.voices.length;
+            // if voice count changed, update voice amount
+            if (channel.voices.length !== voiceCount)
+            {
+                channel.sendChannelProperty();
+            }
         });
-        
-        // if voice count changed, update voice amount
-        if (totalCurrentVoices !== this.totalVoicesAmount)
-        {
-            this.totalVoicesAmount = totalCurrentVoices;
-            this.sendChannelProperties();
-        }
+        // keep the processor alive
         return true;
     }
     
@@ -591,7 +591,6 @@ SpessaSynthProcessor.prototype.getWorkletVoices = getWorkletVoices;
 
 // message port related
 SpessaSynthProcessor.prototype.handleMessage = handleMessage;
-SpessaSynthProcessor.prototype.sendChannelProperties = sendChannelProperties;
 SpessaSynthProcessor.prototype.callEvent = callEvent;
 
 // system-exclusive related

package/synthetizer/worklet_system/message_protocol/message_sending.js

@@ -1,8 +1,5 @@
 import { returnMessageType } from "./worklet_message.js";
 
-import { modulatorSources } from "../../../soundfont/basic_soundfont/modulator.js";
-import { customControllers, NON_CC_INDEX_OFFSET } from "../worklet_utilities/controller_tables.js";
-
 /**
  * Calls synth event from the worklet side
  * @param eventName {EventTypes} the event name
@@ -22,43 +19,4 @@ export function callEvent(eventName, eventData)
             eventData: eventData
         }
     });
-}
-
-/**
- * @typedef {Object} ChannelProperty
- * @property {number} voicesAmount
- * @property {number} pitchBend - from -8192 do 8192
- * @property {number} pitchBendRangeSemitones - in semitones
- * @property {boolean} isMuted
- * @property {boolean} isDrum
- * @property {number} transposition
- */
-
-/**
- * @this {SpessaSynthProcessor}
- */
-export function sendChannelProperties()
-{
-    if (!this.enableEventSystem)
-    {
-        return;
-    }
-    /**
-     * @type {ChannelProperty[]}
-     */
-    const data = this.workletProcessorChannels.map(c =>
-    {
-        return {
-            voicesAmount: c.voices.length,
-            pitchBend: c.midiControllers[NON_CC_INDEX_OFFSET + modulatorSources.pitchWheel],
-            pitchBendRangeSemitones: c.midiControllers[NON_CC_INDEX_OFFSET + modulatorSources.pitchWheelRange] / 128,
-            isMuted: c.isMuted,
-            isDrum: c.drumChannel,
-            transposition: c.channelTransposeKeyShift + c.customControllers[customControllers.channelTransposeFine] / 100
-        };
-    });
-    this.post({
-        messageType: returnMessageType.channelProperties,
-        messageData: data
-    });
 }

package/synthetizer/worklet_system/message_protocol/worklet_message.js

@@ -79,16 +79,15 @@ export const ALL_CHANNELS_OR_DIFFERENT_ACTION = -1;
 /**
  * @typedef {{
  *     channelNumber: number
- *     messageType: workletMessageType,
+ *     messageType: (workletMessageType|number),
  *     messageData: (
+ *     boolean|
  *     number[]
  *     |undefined
  *     |boolean[]
  *     |WorkletVoice[]
  *     |number
- *     |{sampleData: Float32Array, sampleID: number}
  *     |{rate: number, depth: number, delay: number}
- *     |boolean
  *     |ArrayBuffer
  *     |{messageType: WorkletSequencerMessageType, messageData: any}
  *     |{messageType: workletKeyModifierMessageType, messageData: any}
@@ -102,14 +101,14 @@ export const ALL_CHANNELS_OR_DIFFERENT_ACTION = -1;
  * @property {{
  *     eventName: string,
  *     eventData: any
- * }|ChannelProperty[]
+ * }|ChannelProperty
  * |PresetListElement[]
  * |string
  * |{messageType: WorkletSequencerReturnMessageType, messageData: any}
  * |SynthesizerSnapshot
  * |[WorkletSoundfontManagerMessageType, any]} messageData - the message's data
  *
- * 0 - channel properties           -> [...<ChannelProperty>] see message_sending.js line 29
+ * 0 - channel property change      -> [channel<number>, property<ChannelProperty>] see message_sending.js line 29
  * 1 - event call                   -> {eventName<string>, eventData:<the event's data>}
  * 2 - master parameter change      -> [parameter<masterParameterType>, value<string|number>]
  * 3 - sequencer specific           -> [messageType<WorkletSequencerReturnMessageType> messageData<any>] note: refer to sequencer_message.js
@@ -122,7 +121,7 @@ export const ALL_CHANNELS_OR_DIFFERENT_ACTION = -1;
  * @enum {number}
  */
 export const returnMessageType = {
-    channelProperties: 0,
+    channelPropertyChange: 0,
     eventCall: 1,
     masterParameterChange: 2,
     sequencerSpecific: 3,

package/synthetizer/worklet_system/worklet_methods/create_worklet_channel.js

@@ -14,7 +14,7 @@ export function createWorkletChannel(sendEvent = false)
     const channel = new WorkletProcessorChannel(this, this.defaultPreset, this.workletProcessorChannels.length);
     this.workletProcessorChannels.push(channel);
     channel.resetControllers();
-    this.sendChannelProperties();
+    channel.sendChannelProperty();
     if (sendEvent)
     {
         this.callEvent("newchannel", undefined);

package/synthetizer/worklet_system/worklet_methods/mute_channel.js

@@ -9,7 +9,7 @@ export function muteChannel(isMuted)
         this.stopAllNotes(true);
     }
     this.isMuted = isMuted;
-    this.synth.sendChannelProperties();
+    this.sendChannelProperty();
     this.synth.callEvent("mutechannel", {
         channel: this.channelNumber,
         isMuted: isMuted

package/synthetizer/worklet_system/worklet_methods/note_on.js

@@ -165,7 +165,7 @@ export function noteOn(midiNote, velocity, enableDebugging = false, sendEvent =
     channelVoices.push(...voices);
     if (sendEvent)
     {
-        this.synth.sendChannelProperties();
+        this.sendChannelProperty();
         this.synth.callEvent("noteon", {
             midiNote: midiNote,
             channel: this.channelNumber,

package/synthetizer/worklet_system/worklet_methods/program_change.js

@@ -13,6 +13,9 @@ export function programChange(programNumber, userChange = false)
     // always 128 for percussion
     let bank = this.getBankSelect();
     let sentBank;
+    /**
+     * @type {BasicPreset}
+     */
     let preset;
     
     const isXG = this.isXGChannel;
@@ -34,21 +37,27 @@ export function programChange(programNumber, userChange = false)
         else
         {
             preset = this.synth.soundfontManager.getPreset(bank, programNumber, isXG);
-            sentBank = preset.bank;
+            const offset = this.synth.soundfontManager.soundfontList
+                .find(s => s.soundfont === preset.parentSoundBank).bankOffset;
+            sentBank = preset.bank - offset;
             this.presetUsesOverride = false;
         }
     }
     else
     {
         preset = this.synth.soundfontManager.getPreset(bank, programNumber, isXG);
-        sentBank = preset.bank;
+        const offset = this.synth.soundfontManager.soundfontList
+            .find(s => s.soundfont === preset.parentSoundBank).bankOffset;
+        sentBank = preset.bank - offset;
         this.presetUsesOverride = false;
     }
     this.setPreset(preset);
+    this.sentBank = sentBank;
     this.synth.callEvent("programchange", {
         channel: this.channelNumber,
         program: preset.program,
         bank: sentBank,
         userCalled: userChange
     });
+    this.sendChannelProperty();
 }

package/synthetizer/worklet_system/worklet_methods/stopping_notes/stop_all_notes.js

@@ -10,7 +10,7 @@ export function stopAllNotes(force = false)
         // force stop all
         this.voices.length = 0;
         this.sustainedVoices.length = 0;
-        this.synth.sendChannelProperties();
+        this.sendChannelProperty();
     }
     else
     {

package/synthetizer/worklet_system/worklet_methods/tuning_control/pitch_wheel.js

@@ -29,5 +29,5 @@ export function pitchWheel(MSB, LSB)
             0,
             modulatorSources.pitchWheel
         ));
-    this.synth.sendChannelProperties();
+    this.sendChannelProperty();
 }

package/synthetizer/worklet_system/worklet_methods/tuning_control/transpose_channel.js

@@ -30,5 +30,5 @@ export function transposeChannel(semitones, force = false)
     // apply transpose
     this.channelTransposeKeyShift = keyShift;
     this.setCustomController(customControllers.channelTransposeFine, (semitones - keyShift) * 100);
-    this.synth.sendChannelProperties();
+    this.sendChannelProperty();
 }

package/synthetizer/worklet_system/worklet_utilities/worklet_processor_channel.js

@@ -2,7 +2,8 @@ import {
     CONTROLLER_TABLE_SIZE,
     CUSTOM_CONTROLLER_TABLE_SIZE,
     customControllers,
-    dataEntryStates
+    dataEntryStates,
+    NON_CC_INDEX_OFFSET
 } from "./controller_tables.js";
 import {
     resetControllers,
@@ -29,6 +30,8 @@ import { setOctaveTuning } from "../worklet_methods/tuning_control/set_octave_tu
 import { programChange } from "../worklet_methods/program_change.js";
 import { chooseBank, isSystemXG, parseBankSelect } from "../../../utils/xg_hacks.js";
 import { DEFAULT_PERCUSSION } from "../../synth_constants.js";
+import { modulatorSources } from "../../../soundfont/basic_soundfont/modulator.js";
+import { returnMessageType } from "../message_protocol/worklet_message.js";
 
 /**
  * This class represents a single MIDI Channel within the synthesizer.
@@ -115,6 +118,12 @@ class WorkletProcessorChannel
      */
     bank = 0;
     
+    /**
+     * The bank number sent as channel properties.
+     * @type {number}
+     */
+    sentBank = 0;
+    
     /**
      * The bank LSB number of the channel (used for patch changes in XG mode).
      * @type {number}
@@ -359,7 +368,7 @@ class WorkletProcessorChannel
             isDrumChannel: this.drumChannel
         });
         this.programChange(this.preset.program);
-        this.synth.sendChannelProperties();
+        this.sendChannelProperty();
     }
     
     /**
@@ -386,6 +395,48 @@ class WorkletProcessorChannel
         this.channelVibrato.delay = 0;
         this.channelVibrato.depth = 0;
     }
+    
+    
+    /**
+     * @typedef {Object} ChannelProperty
+     * @property {number} voicesAmount - the channel's current voice amount
+     * @property {number} pitchBend - the channel's current pitch bend from -8192 do 8192
+     * @property {number} pitchBendRangeSemitones - the pitch bend's range, in semitones
+     * @property {boolean} isMuted - indicates whether the channel is muted
+     * @property {boolean} isDrum - indicates whether the channel is a drum channel
+     * @property {number} transposition - the channel's transposition, in semitones
+     * @property {number} bank - the bank number of the current preset
+     * @property {number} program - the MIDI program number of the current preset
+     */
+    
+    
+    /**
+     * Sends this channel's property
+     */
+    sendChannelProperty()
+    {
+        if (!this.synth.enableEventSystem)
+        {
+            return;
+        }
+        /**
+         * @type {ChannelProperty}
+         */
+        const data = {
+            voicesAmount: this.voices.length,
+            pitchBend: this.midiControllers[NON_CC_INDEX_OFFSET + modulatorSources.pitchWheel],
+            pitchBendRangeSemitones: this.midiControllers[NON_CC_INDEX_OFFSET + modulatorSources.pitchWheelRange] / 128,
+            isMuted: this.isMuted,
+            isDrum: this.drumChannel,
+            transposition: this.channelTransposeKeyShift + this.customControllers[customControllers.channelTransposeFine] / 100,
+            bank: this.sentBank,
+            program: this.preset.program
+        };
+        this.synth.post({
+            messageType: returnMessageType.channelPropertyChange,
+            messageData: [this.channelNumber, data]
+        });
+    }
 }
 
 // voice