spessasynth_lib 3.20.30 → 3.20.32

package/synthetizer/worklet_system/minify_processor.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
-cd "$(dirname "$0")"
+cd "$(dirname "$0")" || exit
 esbuild worklet_processor.js --bundle --minify --format=esm --outfile=../worklet_processor.min.js --platform=browser
 echo "Processor minifed succesfully"

package/synthetizer/worklet_system/worklet_methods/controller_control.js

@@ -41,7 +41,8 @@ export function controllerChange(channel, controllerNumber, controllerValue, for
         channelObject.midiControllers[actualCCNum] = (channelObject.midiControllers[actualCCNum] & 0x3F80) | (controllerValue & 0x7F);
         channelObject.voices.forEach(v => computeModulators(v, channelObject.midiControllers, 1, actualCCNum));
     }
-    switch (controllerNumber) {
+    switch (controllerNumber)
+    {
         case midiControllers.allNotesOff:
             this.stopAll(channel);
             break;

package/synthetizer/worklet_system/worklet_methods/reset_controllers.js

@@ -87,6 +87,7 @@ export function resetAllControllers(log= true)
         restoreControllerValueEvent(midiControllers.modulationWheel);
         restoreControllerValueEvent(midiControllers.effects3Depth);
         restoreControllerValueEvent(midiControllers.effects1Depth);
+        restoreControllerValueEvent(midiControllers.brightness);
 
         // restore pitch wheel
         if(this.workletProcessorChannels[channelNumber].lockedControllers[NON_CC_INDEX_OFFSET + modulatorSources.pitchWheel])

package/synthetizer/worklet_system/worklet_methods/voice_control.js

@@ -3,7 +3,11 @@ import { absCentsToHz, timecentsToSeconds } from '../worklet_utilities/unit_conv
 import { getLFOValue } from '../worklet_utilities/lfo.js'
 import { customControllers } from '../worklet_utilities/worklet_processor_channel.js'
 import { WorkletModulationEnvelope } from '../worklet_utilities/modulation_envelope.js'
-import { getSampleLinear, getSampleNearest, interpolationTypes } from '../worklet_utilities/wavetable_oscillator.js'
+import {
+    getSampleLinear,
+    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'
@@ -149,13 +153,16 @@ export function renderVoice(
     const bufferOut = new Float32Array(outputLeft.length);
 
     // wavetable oscillator
-    if(this.interpolationType === interpolationTypes.linear)
+    switch(this.interpolationType)
     {
-        getSampleLinear(voice, bufferOut);
-    }
-    else
-    {
-        getSampleNearest(voice, bufferOut);
+        case interpolationTypes.linear:
+        default:
+            getSampleLinear(voice, bufferOut);
+            break;
+
+        case interpolationTypes.nearestNeighbor:
+            getSampleNearest(voice, bufferOut);
+            break;
     }
 
     // lowpass filter
@@ -257,4 +264,8 @@ export function releaseVoice(voice)
     {
         voice.releaseStartTime = voice.startTime + MIN_NOTE_LENGTH;
     }
+    if(voice.sample.loopingMode === 3)
+    {
+        voice.sample.isLooping = false;
+    }
 }

package/synthetizer/worklet_system/worklet_utilities/volume_envelope.js

@@ -10,6 +10,7 @@ export const VOLUME_ENVELOPE_SMOOTHING_FACTOR = 0.001;
 
 const DB_SILENCE = 100;
 const PERCEIVED_DB_SILENCE = 90;
+const PERCEIVED_GAIN_SILENCE = 0.005;
 
 /**
  * VOL ENV STATES:
@@ -257,6 +258,7 @@ export class WorkletVolumeEnvelope
             {
                 voice.finished = true;
             }
+            env.currentReleaseGain = decibelAttenuationToGain(env.releaseStartDb);
         }
     }
 
@@ -291,18 +293,17 @@ export class WorkletVolumeEnvelope
                 return;
             }
             let dbDifference = DB_SILENCE - env.releaseStartDb;
-            let db = 0;
             for (let i = 0; i < audioBuffer.length; i++)
             {
-                db = (elapsedRelease / env.releaseDuration) * dbDifference + env.releaseStartDb;
+                let db = (elapsedRelease / env.releaseDuration) * dbDifference + env.releaseStartDb;
                 let gain = decibelAttenuationToGain(db + decibelOffset);
                 env.currentReleaseGain += (gain - env.currentReleaseGain) * releaseSmoothingFactor;
                 audioBuffer[i] *= env.currentReleaseGain;
                 env.currentSampleTime++;
                 elapsedRelease++;
             }
-    
-            if(db >= PERCEIVED_DB_SILENCE)
+
+            if(env.currentReleaseGain <= PERCEIVED_GAIN_SILENCE)
             {
                 voice.finished = true;
             }
@@ -329,6 +330,7 @@ export class WorkletVolumeEnvelope
             // fallthrough
     
             case 1:
+                let gain;
                 // attack phase: ramp from 0 to attenuation
                 while(env.currentSampleTime < env.attackEnd)
                 {
@@ -337,11 +339,11 @@ 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
-                    audioBuffer[filledBuffer] *= linearAttenuation * decibelAttenuationToGain(env.attenuation + decibelOffset)
-    
+                    gain = linearAttenuation * decibelAttenuationToGain(env.attenuation + decibelOffset)
+                    audioBuffer[filledBuffer] *= gain;
                     // set current attenuation to peak as its invalid during this phase
                     env.currentAttenuationDb = env.attenuation;
-    
+
                     env.currentSampleTime++;
                     if(++filledBuffer >= audioBuffer.length)
                     {

package/synthetizer/worklet_system/worklet_utilities/wavetable_oscillator.js

@@ -9,7 +9,8 @@
  */
 export const interpolationTypes = {
     linear: 0,
-    nearestNeighbor: 1
+    nearestNeighbor: 1,
+    fourthOrder: 2,
 }
 
 
@@ -20,17 +21,17 @@ export const interpolationTypes = {
  */
 export function getSampleLinear(voice, outputBuffer)
 {
-    let cur = voice.sample.cursor;
-    const loop = (voice.sample.loopingMode === 1) || (voice.sample.loopingMode === 3 && !voice.isInRelease);
-    const sampleData = voice.sample.sampleData;
+    const sample = voice.sample;
+    let cur = sample.cursor;
+    const sampleData = sample.sampleData;
 
-    if(loop)
+    if(sample.isLooping)
     {
-        const loopLength = voice.sample.loopEnd - voice.sample.loopStart;
+        const loopLength = sample.loopEnd - sample.loopStart;
         for (let i = 0; i < outputBuffer.length; i++)
         {
             // check for loop
-            while(cur >= voice.sample.loopEnd)
+            while(cur >= sample.loopEnd)
             {
                 cur -= loopLength;
             }
@@ -39,7 +40,7 @@ export function getSampleLinear(voice, outputBuffer)
             const floor = ~~cur;
             let ceil = floor + 1;
 
-            while(ceil >= voice.sample.loopEnd)
+            while(ceil >= sample.loopEnd)
             {
                 ceil -= loopLength;
             }
@@ -51,22 +52,15 @@ export function getSampleLinear(voice, outputBuffer)
             const lower = sampleData[floor];
             outputBuffer[i] = (lower + (upper - lower) * fraction);
 
-            // commented code because it's probably gonna come handy... (it did like 6 times already :/)
-            // if(isNaN(outputBuffer[i]))
-            // {
-            //     console.error(voice, upper, lower, floor, ceil, cur)
-            //     throw "NAN ALERT";
-            // }
-
-            cur += voice.sample.playbackStep * voice.currentTuningCalculated;
+            cur += sample.playbackStep * voice.currentTuningCalculated;
         }
     }
     else
     {
         // check and correct end errors
-        if(voice.sample.end >= sampleData.length)
+        if(sample.end >= sampleData.length)
         {
-            voice.sample.end = sampleData.length - 1;
+            sample.end = sampleData.length - 1;
         }
         for (let i = 0; i < outputBuffer.length; i++)
         {
@@ -76,7 +70,7 @@ export function getSampleLinear(voice, outputBuffer)
             const ceil = floor + 1;
 
             // flag the voice as finished if needed
-            if(ceil >= voice.sample.end)
+            if(ceil >= sample.end)
             {
                 voice.finished = true;
                 return;
@@ -89,7 +83,7 @@ export function getSampleLinear(voice, outputBuffer)
             const lower = sampleData[floor];
             outputBuffer[i] = (lower + (upper - lower) * fraction);
 
-            cur += voice.sample.playbackStep * voice.currentTuningCalculated;
+            cur += sample.playbackStep * voice.currentTuningCalculated;
         }
     }
     voice.sample.cursor = cur;
@@ -102,16 +96,16 @@ export function getSampleLinear(voice, outputBuffer)
  */
 export function getSampleNearest(voice, outputBuffer)
 {
-    let cur = voice.sample.cursor;
-    const loop = (voice.sample.loopingMode === 1) || (voice.sample.loopingMode === 3 && !voice.isInRelease);
-    const loopLength = voice.sample.loopEnd - voice.sample.loopStart;
-    const sampleData = voice.sample.sampleData;
-    if(loop)
+    const sample = voice.sample;
+    let cur = sample.cursor;
+    const loopLength = sample.loopEnd - sample.loopStart;
+    const sampleData = sample.sampleData;
+    if(voice.sample.isLooping)
     {
         for (let i = 0; i < outputBuffer.length; i++)
         {
             // check for loop
-            while(cur >= voice.sample.loopEnd)
+            while(cur >= sample.loopEnd)
             {
                 cur -= loopLength;
             }
@@ -119,21 +113,21 @@ export function getSampleNearest(voice, outputBuffer)
             // grab the nearest neighbor
             let ceil = ~~cur + 1;
 
-            while(ceil >= voice.sample.loopEnd)
+            while(ceil >= sample.loopEnd)
             {
                 ceil -= loopLength;
             }
 
             outputBuffer[i] = sampleData[ceil];
-            cur += voice.sample.playbackStep * voice.currentTuningCalculated;
+            cur += sample.playbackStep * voice.currentTuningCalculated;
         }
     }
     else
     {
         // check and correct end errors
-        if(voice.sample.end >= sampleData.length)
+        if(sample.end >= sampleData.length)
         {
-            voice.sample.end = sampleData.length - 1;
+            sample.end = sampleData.length - 1;
         }
         for (let i = 0; i < outputBuffer.length; i++)
         {
@@ -142,7 +136,7 @@ export function getSampleNearest(voice, outputBuffer)
             const ceil = ~~cur + 1;
 
             // flag the voice as finished if needed
-            if(ceil >= voice.sample.end)
+            if(ceil >= sample.end)
             {
                 voice.finished = true;
                 return;
@@ -150,8 +144,8 @@ export function getSampleNearest(voice, outputBuffer)
 
             //nearest neighbor (uncomment to use)
             outputBuffer[i] = sampleData[ceil];
-            cur += voice.sample.playbackStep * voice.currentTuningCalculated;
+            cur += sample.playbackStep * voice.currentTuningCalculated;
         }
     }
-    voice.sample.cursor = cur;
+    sample.cursor = cur;
 }

package/synthetizer/worklet_system/worklet_utilities/worklet_processor_channel.js

@@ -92,7 +92,6 @@ resetArray[midiControllers.expressionController] = 127 << 7;
 resetArray[midiControllers.pan] = 64 << 7;
 resetArray[midiControllers.releaseTime] = 64 << 7;
 resetArray[midiControllers.brightness] = 64 << 7;
-resetArray[midiControllers.effects1Depth] = 40 << 7;
 resetArray[NON_CC_INDEX_OFFSET + modulatorSources.pitchWheel] = 8192;
 resetArray[NON_CC_INDEX_OFFSET + modulatorSources.pitchWheelRange] = 2 << 7;
 

package/synthetizer/worklet_system/worklet_utilities/worklet_voice.js

@@ -35,7 +35,11 @@ class WorkletSample
         this.loopEnd = loopEnd;
         this.end = endIndex;
         this.loopingMode = loopingMode;
+        this.isLooping = this.loopingMode === 1 || this.loopingMode === 3
     }
+
+
+
     /**
      * the sample's audio data
      * @type {Float32Array}
@@ -86,6 +90,13 @@ class WorkletSample
      * @type {0|1|2}
      */
     loopingMode = 0;
+
+
+    /**
+     * Indicates if the sample is currently looping
+     * @type {boolean}
+     */
+    isLooping = false;
 }
 
 import { addAndClampGenerator, generatorTypes } from '../../../soundfont/read_sf2/generators.js'