spessasynth_lib 3.20.32 → 3.20.34

package/synthetizer/worklet_system/worklet_utilities/volume_envelope.js

@@ -330,7 +330,6 @@ export class WorkletVolumeEnvelope
             // fallthrough
     
             case 1:
-                let gain;
                 // attack phase: ramp from 0 to attenuation
                 while(env.currentSampleTime < env.attackEnd)
                 {
@@ -339,8 +338,7 @@ export class WorkletVolumeEnvelope
 
                     // Special case: linear gain ramp instead of linear db ramp
                     let linearAttenuation = 1 - (env.attackEnd - env.currentSampleTime) / env.attackDuration; // 0 to 1
-                    gain = linearAttenuation * decibelAttenuationToGain(env.attenuation + decibelOffset)
-                    audioBuffer[filledBuffer] *= gain;
+                    audioBuffer[filledBuffer] *= linearAttenuation * decibelAttenuationToGain(env.attenuation + decibelOffset);
                     // set current attenuation to peak as its invalid during this phase
                     env.currentAttenuationDb = env.attenuation;
 

package/synthetizer/worklet_system/worklet_utilities/worklet_modulator.js

@@ -1,7 +1,7 @@
 import { modulatorSources } from '../../../soundfont/read_sf2/modulators.js'
 import { getModulatorCurveValue, MOD_PRECOMPUTED_LENGTH } from './modulator_curves.js'
 import { NON_CC_INDEX_OFFSET } from './worklet_processor_channel.js'
-import { generatorTypes } from '../../../soundfont/read_sf2/generators.js'
+import { generatorLimits, generatorTypes } from '../../../soundfont/read_sf2/generators.js'
 import { WorkletVolumeEnvelope } from './volume_envelope.js'
 import { WorkletModulationEnvelope } from './modulation_envelope.js'
 
@@ -123,7 +123,9 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
         // All modulators mode: compute all modulators
         modulatedGenerators.set(generators);
         modulators.forEach(mod => {
-            modulatedGenerators[mod.modulatorDestination] += computeWorkletModulator(controllerTable, mod, voice);
+            const limits = generatorLimits[mod.modulatorDestination];
+            const newValue = modulatedGenerators[mod.modulatorDestination] + computeWorkletModulator(controllerTable, mod, voice);
+            modulatedGenerators[mod.modulatorDestination] = Math.max(limits.min, Math.min(newValue, limits.max));
         });
         WorkletVolumeEnvelope.recalculate(voice);
         return;
@@ -158,7 +160,10 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
                 modulators.forEach(m => {
                     if (m.modulatorDestination === destination)
                     {
-                        modulatedGenerators[destination] += computeWorkletModulator(controllerTable, m, voice);
+                        const limits = generatorLimits[mod.modulatorDestination];
+                        const current = modulatedGenerators[mod.modulatorDestination];
+                        const newValue = current + computeWorkletModulator(controllerTable, m, voice);
+                        modulatedGenerators[mod.modulatorDestination] = Math.max(limits.min, Math.min(newValue, limits.max));
                     }
                 });
                 computedDestinations.add(destination);
@@ -183,16 +188,16 @@ const transforms = [];
 for(let curve = 0; curve < 4; curve++)
 {
     transforms[curve] =
-    [
         [
-            new Float32Array(MOD_PRECOMPUTED_LENGTH),
-            new Float32Array(MOD_PRECOMPUTED_LENGTH)
-        ],
-        [
-            new Float32Array(MOD_PRECOMPUTED_LENGTH),
-            new Float32Array(MOD_PRECOMPUTED_LENGTH)
-        ]
-    ];
+            [
+                new Float32Array(MOD_PRECOMPUTED_LENGTH),
+                new Float32Array(MOD_PRECOMPUTED_LENGTH)
+            ],
+            [
+                new Float32Array(MOD_PRECOMPUTED_LENGTH),
+                new Float32Array(MOD_PRECOMPUTED_LENGTH)
+            ]
+        ];
     for (let i = 0; i < MOD_PRECOMPUTED_LENGTH; i++) {
 
         // polarity 0 dir 0