spessasynth_lib 3.20.22 → 3.20.23

package/synthetizer/worklet_system/main_processor.js

@@ -26,7 +26,7 @@ import {
     setMasterPan,
     setMIDIVolume,
 } from './worklet_methods/controller_control.js'
-import { disableAndLockVibrato, setVibrato } from './worklet_methods/vibrato_control.js'
+import { disableAndLockGSNRPN, setVibrato } from './worklet_methods/vibrato_control.js'
 import { dataEntryCoarse, dataEntryFine } from './worklet_methods/data_entry.js'
 import { createWorkletChannel } from './worklet_utilities/worklet_processor_channel.js'
 import { resetAllControllers, resetControllers, resetParameters } from './worklet_methods/reset_controllers.js'
@@ -385,7 +385,7 @@ SpessaSynthProcessor.prototype.muteChannel = muteChannel;
 
 // custom vibrato related
 SpessaSynthProcessor.prototype.setVibrato = setVibrato;
-SpessaSynthProcessor.prototype.disableAndLockVibrato = disableAndLockVibrato;
+SpessaSynthProcessor.prototype.disableAndLockGSNRPN = disableAndLockGSNRPN;
 
 // data entry related
 SpessaSynthProcessor.prototype.dataEntryCoarse = dataEntryCoarse;

package/synthetizer/worklet_system/message_protocol/handle_message.js

@@ -77,7 +77,7 @@ export function handleMessage(message)
                 {
                     if(data.rate === -1)
                     {
-                        this.disableAndLockVibrato(i);
+                        this.disableAndLockGSNRPN(i);
                     }
                     else
                     {
@@ -88,7 +88,7 @@ export function handleMessage(message)
             else
             if(data.rate === -1)
             {
-                this.disableAndLockVibrato(channel);
+                this.disableAndLockGSNRPN(channel);
             }
             else
             {

package/synthetizer/worklet_system/worklet_methods/data_entry.js

@@ -43,6 +43,10 @@ export function dataEntryCoarse(channel, dataValue)
             {
                 return;
             }
+            if(channelObject.lockGSNRPNParams)
+            {
+                return;
+            }
             switch(channelObject.NRPCoarse)
             {
                 default:
@@ -83,10 +87,6 @@ export function dataEntryCoarse(channel, dataValue)
 
                         // vibrato rate
                         case 0x08:
-                            if(channelObject.lockVibrato)
-                            {
-                                return;
-                            }
                             if(dataValue === 64)
                             {
                                 return;
@@ -103,10 +103,6 @@ export function dataEntryCoarse(channel, dataValue)
 
                         // vibrato depth
                         case 0x09:
-                            if(channelObject.lockVibrato)
-                            {
-                                return;
-                            }
                             if(dataValue === 64)
                             {
                                 return;
@@ -123,10 +119,6 @@ export function dataEntryCoarse(channel, dataValue)
 
                         // vibrato delay
                         case 0x0A:
-                            if(channelObject.lockVibrato)
-                            {
-                                return;
-                            }
                             if(dataValue === 64)
                             {
                                 return;
@@ -156,10 +148,6 @@ export function dataEntryCoarse(channel, dataValue)
 
                 // drum key tuning
                 case 0x18:
-                    if(!channelObject.drumChannel)
-                    {
-                        return;
-                    }
                     // fine is the key number and data value is the semitone change
                     const semitones = dataValue - 64;
                     channelObject.keyCentTuning[channelObject.NRPFine] = semitones * 100;
@@ -172,10 +160,6 @@ export function dataEntryCoarse(channel, dataValue)
 
                 // drum reverb
                 case 0x1D:
-                    if(!channelObject.drumChannel)
-                    {
-                        return;
-                    }
                     const reverb = dataValue;
                     this.controllerChange(channel, midiControllers.effects1Depth, reverb);
                     SpessaSynthInfo(

package/synthetizer/worklet_system/worklet_methods/snapshot.js

@@ -60,7 +60,7 @@ export function sendSynthesizerSnapshot()
             customControllers: channel.customControllers,
 
             channelVibrato: channel.channelVibrato,
-            lockVibrato: channel.lockVibrato,
+            lockVibrato: channel.lockGSNRPNParams,
 
             channelTransposeKeyShift: channel.channelTransposeKeyShift,
             channelOctaveTuning: channel.channelOctaveTuning,
@@ -123,7 +123,7 @@ export function applySynthesizerSnapshot(snapshot)
 
         // restore vibrato and transpose
         channelObject.channelVibrato = channelSnapshot.channelVibrato;
-        channelObject.lockVibrato = channelSnapshot.lockVibrato;
+        channelObject.lockGSNRPNParams = channelSnapshot.lockVibrato;
         channelObject.channelTransposeKeyShift = channelSnapshot.channelTransposeKeyShift;
         channelObject.channelOctaveTuning = channelSnapshot.channelOctaveTuning;
 

package/synthetizer/worklet_system/worklet_methods/vibrato_control.js

@@ -2,9 +2,9 @@
  * @param channel {number}
  * @this {SpessaSynthProcessor}
  */
-export function disableAndLockVibrato(channel)
+export function disableAndLockGSNRPN(channel)
 {
-    this.workletProcessorChannels[channel].lockVibrato = true;
+    this.workletProcessorChannels[channel].lockGSNRPNParams = true;
     this.workletProcessorChannels[channel].channelVibrato.rate = 0;
     this.workletProcessorChannels[channel].channelVibrato.delay = 0;
     this.workletProcessorChannels[channel].channelVibrato.depth = 0;
@@ -19,7 +19,7 @@ export function disableAndLockVibrato(channel)
  */
 export function setVibrato(channel, depth, rate, delay)
 {
-    if(this.workletProcessorChannels[channel].lockVibrato)
+    if(this.workletProcessorChannels[channel].lockGSNRPNParams)
     {
         return;
     }

package/synthetizer/worklet_system/worklet_utilities/worklet_processor_channel.js

@@ -21,7 +21,7 @@ import { modulatorSources } from '../../../soundfont/read_sf2/modulators.js'
  * @property {boolean} lockPreset - indicates whether the program on the channel is locked
  * @property {boolean} presetUsesOverride - indcates if the channel uses a preset from the override soundfont.
  *
- * @property {boolean} lockVibrato - indicates whether the custom vibrato is locked
+ * @property {boolean} lockGSNRPNParams - indicates whether the GS NRPN parameters are enabled
  * @property {Object} channelVibrato - vibrato settings for the channel
  * @property {number} channelVibrato.depth - depth of the vibrato effect (cents)
  * @property {number} channelVibrato.delay - delay before the vibrato effect starts (seconds)
@@ -62,7 +62,7 @@ export function createWorkletChannel(sendEvent = false)
         channelOctaveTuning: new Int8Array(12),
         keyCentTuning: new Int16Array(128),
         channelVibrato: {delay: 0, depth: 0, rate: 0},
-        lockVibrato: false,
+        lockGSNRPNParams: false,
         holdPedal: false,
         isMuted: false,
         drumChannel: false,

package/utils/buffer_to_wav.js

@@ -149,8 +149,8 @@ export function audioBufferToWav(audioBuffer, normalizeAudio = true, channelOffs
     for (let i = 0; i < length; i++)
     {
         // interleave both channels
-        const sample1 = Math.min(32767, Math.max(-37268, channel1Data[i] * multiplier));
-        const sample2 = Math.min(32767, Math.max(-37268, channel2Data[i] * multiplier));
+        const sample1 = Math.min(32767, Math.max(-32768, channel1Data[i] * multiplier));
+        const sample2 = Math.min(32767, Math.max(-32768, channel2Data[i] * multiplier));
 
         // convert to 16-bit
         wavData[offset++] = sample1 & 0xff;