spessasynth_lib 3.22.2 → 3.22.4

package/synthetizer/worklet_system/worklet_methods/snapshot.js

@@ -27,6 +27,7 @@
 /**
  * @typedef {Object} SynthesizerSnapshot
  * @property {ChannelSnapshot[]} channelSnapshots - the individual channel snapshots
+ * @property {KeyModifier[][]} keyMappings - key modifiers
  * @property {number} mainVolume - main synth volume (set by MIDI), from 0 to 1
  * @property {number} pan - master stereo panning, from -1 to 1
  * @property {interpolationTypes} interpolation - the synth's interpolation type
@@ -82,7 +83,8 @@ export function sendSynthesizerSnapshot()
         pan: this.pan,
         transposition: this.transposition,
         system: this.system,
-        interpolation: this.interpolationType
+        interpolation: this.interpolationType,
+        keyMappings: this.keyModifierManager.getMappings()
     };
     
     this.post({
@@ -106,6 +108,7 @@ export function applySynthesizerSnapshot(snapshot)
     this.setMasterPan(snapshot.pan);
     this.transposeAllChannels(snapshot.transposition);
     this.interpolationType = snapshot.interpolation;
+    this.keyModifierManager.setMappings(snapshot.keyMappings);
     
     // add channels if more needed
     while (this.workletProcessorChannels.length < snapshot.channelSnapshots.length)

package/synthetizer/worklet_system/worklet_methods/worklet_key_modifier.js

@@ -97,6 +97,22 @@ export class WorkletKeyModifierManager
         this._keyMappings = [];
     }
     
+    /**
+     * @param mappings {KeyModifier[][]}
+     */
+    setMappings(mappings)
+    {
+        this._keyMappings = mappings;
+    }
+    
+    /**
+     * @returns {KeyModifier[][]}
+     */
+    getMappings()
+    {
+        return this._keyMappings;
+    }
+    
     /**
      * @param channel {number}
      * @param midiNote {number}

package/synthetizer/worklet_system/worklet_utilities/modulation_envelope.js

@@ -87,7 +87,6 @@ export class WorkletModulationEnvelope
      */
     static startRelease(voice)
     {
-        voice.modulationEnvelope.releaseStartLevel = voice.modulationEnvelope.currentValue;
         WorkletModulationEnvelope.recalculate(voice);
     }
     
@@ -98,6 +97,12 @@ export class WorkletModulationEnvelope
     {
         const env = voice.modulationEnvelope;
         
+        // in release? Might need to recalculate the value as it can be modulated
+        if (voice.isInRelease)
+        {
+            env.releaseStartLevel = WorkletModulationEnvelope.getValue(voice, voice.releaseStartTime, true);
+        }
+        
         env.sustainLevel = 1 - (voice.modulatedGenerators[generatorTypes.sustainModEnv] / 1000);
         
         env.attackDuration = timecentsToSeconds(voice.modulatedGenerators[generatorTypes.attackModEnv]);
@@ -127,17 +132,19 @@ export class WorkletModulationEnvelope
      * Calculates the current modulation envelope value for the given time and voice
      * @param voice {WorkletVoice} the voice we're working on
      * @param currentTime {number} in seconds
+     * @param ignoreRelease {boolean} if true, it will compute the value as if the voice was not released
      * @returns {number} modenv value, from 0 to 1
      */
-    static getValue(voice, currentTime)
+    static getValue(voice, currentTime, ignoreRelease = false)
     {
         const env = voice.modulationEnvelope;
-        if (voice.isInRelease)
+        if (voice.isInRelease && !ignoreRelease)
         {
-            if (env.releaseDuration < 0.001)
+            // if the voice is still in the delay phase,
+            // start level will be 0 which will result in divide by zero
+            if (env.releaseStartLevel === 0)
             {
-                // prevent lowpass bugs if release is instant
-                return env.releaseStartLevel;
+                return 0;
             }
             return Math.max(
                 0,

package/synthetizer/worklet_system/worklet_utilities/worklet_modulator.js

@@ -130,11 +130,6 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
     const generators = voice.generators;
     const modulatedGenerators = voice.modulatedGenerators;
     
-    // Modulation envelope is cheap to recalculate
-    // why here and not at the bottom?
-    // I dunno, seems to work fine
-    WorkletModulationEnvelope.recalculate(voice);
-    
     if (sourceUsesCC === -1)
     {
         // All modulators mode: compute all modulators
@@ -153,6 +148,7 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
             );
         });
         WorkletVolumeEnvelope.recalculate(voice);
+        WorkletModulationEnvelope.recalculate(voice);
         return;
     }
     
@@ -208,6 +204,8 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
     {
         WorkletVolumeEnvelope.recalculate(voice);
     }
+    
+    WorkletModulationEnvelope.recalculate(voice);
 }