spessasynth_lib 3.21.13 → 3.21.14

package/synthetizer/worklet_system/main_processor.js

@@ -50,6 +50,7 @@ import { applySynthesizerSnapshot, sendSynthesizerSnapshot } from "./worklet_met
 import { WorkletSoundfontManager } from "./worklet_methods/worklet_soundfont_manager/worklet_soundfont_manager.js";
 import { interpolationTypes } from "./worklet_utilities/wavetable_oscillator.js";
 import { getWorkletVoices } from "./worklet_utilities/worklet_voice.js";
+import { panVoice } from "./worklet_utilities/stereo_panner.js";
 
 
 /**
@@ -144,7 +145,7 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
          * the pan of the left channel
          * @type {number}
          */
-        this.panLeft = 0.5 * this.currentGain;
+        this.panLeft = 0.5;
         
         this.highPerformanceMode = false;
         
@@ -158,7 +159,7 @@ class SpessaSynthProcessor extends AudioWorkletProcessor
          * the pan of the right channel
          * @type {number}
          */
-        this.panRight = 0.5 * this.currentGain;
+        this.panRight = 0.5;
         try
         {
             /**
@@ -445,4 +446,6 @@ SpessaSynthProcessor.prototype.sendPresetList = sendPresetList;
 SpessaSynthProcessor.prototype.sendSynthesizerSnapshot = sendSynthesizerSnapshot;
 SpessaSynthProcessor.prototype.applySynthesizerSnapshot = applySynthesizerSnapshot;
 
+SpessaSynthProcessor.prototype.panVoice = panVoice;
+
 export { SpessaSynthProcessor };

package/synthetizer/worklet_system/worklet_methods/controller_control.js

@@ -235,8 +235,8 @@ export function setMasterPan(pan)
     this.pan = pan;
     // clamp to 0-1 (0 is left)
     pan = (pan / 2) + 0.5;
-    this.panLeft = (1 - pan) * this.currentGain;
-    this.panRight = (pan) * this.currentGain;
+    this.panLeft = (1 - pan);
+    this.panRight = (pan);
 }
 
 /**

package/synthetizer/worklet_system/worklet_methods/snapshot.js

@@ -32,6 +32,7 @@
  * @property {interpolationTypes} interpolation - the synth's interpolation type
  * @property {SynthSystem} system - the synths system. Values can be "gs", "gm", "gm2" or "xg"
  * @property {number} transposition - the current synth transpositon in semitones. can be a float
+ * @property {EffectsConfig} effectsConfig - the effects configuration object
  */
 
 import { returnMessageType } from "../message_protocol/worklet_message.js";

package/synthetizer/worklet_system/worklet_methods/voice_control.js

@@ -7,15 +7,12 @@ import {
     getSampleNearest,
     interpolationTypes
 } from "../worklet_utilities/wavetable_oscillator.js";
-import { panVoice } from "../worklet_utilities/stereo_panner.js";
 import { WorkletLowpassFilter } from "../worklet_utilities/lowpass_filter.js";
 import { MIN_NOTE_LENGTH } from "../main_processor.js";
 import { WorkletVolumeEnvelope } from "../worklet_utilities/volume_envelope.js";
 import { generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
 import { customControllers } from "../worklet_utilities/controller_tables.js";
 
-
-const HALF_PI = Math.PI / 2;
 export const PAN_SMOOTHING_FACTOR = 0.05;
 
 /**
@@ -157,8 +154,6 @@ export function renderVoice(
         voice.currentTuningCalculated = Math.pow(2, centsTotal / 1200);
     }
     
-    // PANNING
-    const pan = ((Math.max(-500, Math.min(500, voice.modulatedGenerators[generatorTypes.pan])) + 500) / 1000); // 0 to 1
     
     // SYNTHESIS
     const bufferOut = new Float32Array(outputLeft.length);
@@ -189,20 +184,12 @@ export function renderVoice(
     // volenv
     WorkletVolumeEnvelope.apply(voice, bufferOut, modLfoCentibels, this.volumeEnvelopeSmoothingFactor);
     
-    // pan the voice and write out
-    voice.currentPan += (pan - voice.currentPan) * this.panSmoothingFactor; // smooth out pan to prevent clicking
-    const panLeft = Math.cos(HALF_PI * voice.currentPan) * this.panLeft;
-    const panRight = Math.sin(HALF_PI * voice.currentPan) * this.panRight;
-    // disable reverb and chorus in one output mode
-    const reverb = this.oneOutputMode ? 0 : voice.modulatedGenerators[generatorTypes.reverbEffectsSend];
-    const chorus = this.oneOutputMode ? 0 : voice.modulatedGenerators[generatorTypes.chorusEffectsSend];
-    panVoice(
-        panLeft,
-        panRight,
+    this.panVoice(
+        voice,
         bufferOut,
         outputLeft, outputRight,
-        reverbOutput, reverb,
-        chorusOutput, chorus
+        reverbOutput,
+        chorusOutput
     );
 }
 

package/synthetizer/worklet_system/worklet_utilities/stereo_panner.js

@@ -1,5 +1,8 @@
+import { generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
+
 export const WORKLET_SYSTEM_REVERB_DIVIDER = 4600;
 export const WORKLET_SYSTEM_CHORUS_DIVIDER = 2000;
+const HALF_PI = Math.PI / 2;
 
 /**
  * stereo_panner.js
@@ -8,53 +11,53 @@ export const WORKLET_SYSTEM_CHORUS_DIVIDER = 2000;
 
 /**
  * Pans the voice to the given output buffers
- * @param gainLeft {number} the left channel gain
- * @param gainRight {number} the right channel gain
+ * @param voice {WorkletVoice} the voice to pan
  * @param inputBuffer {Float32Array} the input buffer in mono
  * @param outputLeft {Float32Array} left output buffer
  * @param outputRight {Float32Array} right output buffer
  * @param reverb {Float32Array[]} stereo reverb input
- * @param reverbLevel {number} 0 to 1000, the level of reverb to send
- * @param chorus {Float32Array[]} stereo chorus buttfer
- * @param chorusLevel {number} 0 to 1000, the level of chorus to send
+ * @param chorus {Float32Array[]} stereo chorus buffer
+ * @this {SpessaSynthProcessor}
  */
-export function panVoice(gainLeft,
-                         gainRight,
+export function panVoice(voice,
                          inputBuffer,
                          outputLeft, outputRight,
                          reverb,
-                         reverbLevel,
-                         chorus,
-                         chorusLevel)
+                         chorus)
 {
     if (isNaN(inputBuffer[0]))
     {
         return;
     }
+    const pan = ((Math.max(-500, Math.min(500, voice.modulatedGenerators[generatorTypes.pan])) + 500) / 1000); // 0 to 1
+    voice.currentPan += (pan - voice.currentPan) * this.panSmoothingFactor; // smooth out pan to prevent clicking
+    
+    const gain = this.currentGain;
+    // pan the voice and write out
+    const gainLeft = Math.cos(HALF_PI * voice.currentPan) * gain * this.panLeft;
+    const gainRight = Math.sin(HALF_PI * voice.currentPan) * gain * this.panRight;
+    // disable reverb and chorus in one output mode
+    
+    const reverbLevel = voice.modulatedGenerators[generatorTypes.reverbEffectsSend] / WORKLET_SYSTEM_REVERB_DIVIDER * gain;
+    const chorusLevel = voice.modulatedGenerators[generatorTypes.chorusEffectsSend] / WORKLET_SYSTEM_CHORUS_DIVIDER;
     
-    if (reverbLevel > 0)
+    if (reverbLevel > 0 && !this.oneOutputMode)
     {
         const reverbLeft = reverb[0];
         const reverbRight = reverb[1];
-        // cap reverb
-        reverbLevel = Math.min(reverbLevel, 1000);
-        const reverbGain = reverbLevel / WORKLET_SYSTEM_REVERB_DIVIDER;
         for (let i = 0; i < inputBuffer.length; i++)
         {
-            reverbLeft[i] += reverbGain * inputBuffer[i];
-            reverbRight[i] += reverbGain * inputBuffer[i];
+            reverbLeft[i] += reverbLevel * inputBuffer[i];
+            reverbRight[i] += reverbLevel * inputBuffer[i];
         }
     }
     
-    if (chorusLevel > 0)
+    if (chorusLevel > 0 && !this.oneOutputMode)
     {
         const chorusLeft = chorus[0];
         const chorusRight = chorus[1];
-        // cap chorus
-        chorusLevel = Math.min(chorusLevel, 1000);
-        const chorusGain = chorusLevel / WORKLET_SYSTEM_CHORUS_DIVIDER;
-        const chorusLeftGain = gainLeft * chorusGain;
-        const chorusRightGain = gainRight * chorusGain;
+        const chorusLeftGain = gainLeft * chorusLevel;
+        const chorusRightGain = gainRight * chorusLevel;
         for (let i = 0; i < inputBuffer.length; i++)
         {
             chorusLeft[i] += chorusLeftGain * inputBuffer[i];