Fix broken optimization with modulators reaching max values

spessasus · Sep 30, 2024 · 1d5f65d · 1d5f65d
1 parent f074e9d
commit 1d5f65d
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 51 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "SpessaSynth",
-  "version": "3.20.33",
+  "version": "3.20.34",
   "type": "module",
   "scripts": {
     "start": "node src/website/server/server.js"

diff --git a/src/spessasynth_lib/synthetizer/worklet_processor.min.js b/src/spessasynth_lib/synthetizer/worklet_processor.min.js
diff --git a/src/spessasynth_lib/synthetizer/worklet_system/worklet_utilities/volume_envelope.js b/src/spessasynth_lib/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;
 

diff --git a/src/spessasynth_lib/synthetizer/worklet_system/worklet_utilities/worklet_modulator.js b/src/spessasynth_lib/synthetizer/worklet_system/worklet_utilities/worklet_modulator.js
@@ -124,7 +124,6 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
         modulatedGenerators.set(generators);
         modulators.forEach(mod => {
             const limits = generatorLimits[mod.modulatorDestination];
-            if(modulatedGenerators[mod.modulatorDestination] === limits.min || modulatedGenerators[mod.modulatorDestination] === limits.max) return;
             const newValue = modulatedGenerators[mod.modulatorDestination] + computeWorkletModulator(controllerTable, mod, voice);
             modulatedGenerators[mod.modulatorDestination] = Math.max(limits.min, Math.min(newValue, limits.max));
         });
@@ -163,7 +162,6 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
                     {
                         const limits = generatorLimits[mod.modulatorDestination];
                         const current = modulatedGenerators[mod.modulatorDestination];
-                        if(current === limits.min || current === limits.max) return;
                         const newValue = current + computeWorkletModulator(controllerTable, m, voice);
                         modulatedGenerators[mod.modulatorDestination] = Math.max(limits.min, Math.min(newValue, limits.max));
                     }

diff --git a/src/website/js/utils/drop_file_handler.js b/src/website/js/utils/drop_file_handler.js
@@ -33,7 +33,6 @@ export class DropFileHandler
             {
                 // riff, check if RMID, otherwise soundfont
                 const rmid = buf.slice(8, 12);
-                console.log(decoder.decode(rmid))
                 if(decoder.decode(rmid) === "RMID")
                 {
                     // RMID

diff --git a/src/website/minified/demo_main.min.js b/src/website/minified/demo_main.min.js
diff --git a/src/website/minified/local_main.min.js b/src/website/minified/local_main.min.js