spessasynth_lib 3.20.6 → 3.20.9

package/@types/synthetizer/synthetizer.d.ts

@@ -1,13 +1,3 @@
-/**
- * synthesizer.js
- * purpose: responds to midi messages and called functions, managing the channels and passing the messages to them
- */
-/**
- * @typedef {Object} StartRenderingDataConfig
- * @property {BasicMIDI} parsedMIDI - the MIDI to render
- * @property {SynthesizerSnapshot} snapshot - the snapshot to apply
- * @property {boolean|undefined} oneOutput - if synth should use one output with 32 channels (2 audio channels for each midi channel). this disables chorus and reverb.
- */
 export const WORKLET_PROCESSOR_NAME: "spessasynth-worklet-system";
 export const VOICE_CAP: 450;
 export const DEFAULT_PERCUSSION: 9;
@@ -112,6 +102,19 @@ export class Synthetizer {
      * @param enableTable {boolean} - enable table (debug message)
      */
     setLogLevel(enableInfo: boolean, enableWarning: boolean, enableGroup: boolean, enableTable: boolean): void;
+    /**
+     * @param type {masterParameterType}
+     * @param data {any}
+     * @private
+     */
+    private _setMasterParam;
+    /**
+     * Sets the interpolation type for the synthesizer:
+     * 0 - linear
+     * 1 - nearest neighbor
+     * @param type {interpolationTypes}
+     */
+    setInterpolationType(type: interpolationTypes): void;
     /**
      * Handles the messages received from the worklet
      * @param message {WorkletReturnMessage}

package/@types/synthetizer/worklet_system/message_protocol/worklet_message.d.ts

@@ -35,6 +35,7 @@ export namespace masterParameterType {
     let mainVolume: number;
     let masterPan: number;
     let voicesCap: number;
+    let interpolationType: number;
 }
 export const ALL_CHANNELS_OR_DIFFERENT_ACTION: -1;
 export type returnMessageType = number;
@@ -47,6 +48,7 @@ export namespace returnMessageType {
     export let synthesizerSnapshot: number;
     export let ready: number;
     export let soundfontError: number;
+    export let identify: number;
 }
 export type WorkletMessage = {
     channelNumber: number;
@@ -78,6 +80,7 @@ export type WorkletReturnMessage = {
      * 4 - synthesizer snapshot         -> snapshot<SynthesizerSnapshot> note: refer to snapshot.js
      * 5 - ready                        -> (no data)
      * 6 - soundfontError               -> errorMessage<string>
+     * 7 - idenfity                     -> version<string>
      */
     messageData: {
         eventName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.20.6",
+  "version": "3.20.9",
   "description": "MIDI and SoundFont2 or DLS Synthesizer library with no compromises",
   "browser": "index.js",
   "types": "@types/index.d.ts",

package/soundfont/dls/read_articulation.js

@@ -318,24 +318,29 @@ export function readArticulation(chunk, disableVibrato)
         }
     }
 
-    // override reverb and chorus with 1000 instead of 200
-    modulators.push(
-        new Modulator({
+    // override reverb and chorus with 1000 instead of 200 (if not overriden)
+    // reverb
+    if(modulators.find(m => m.modulatorDestination === generatorTypes.reverbEffectsSend) === undefined)
+    {
+        modulators.push(new Modulator({
             srcEnum: 0x00DB,
             dest: generatorTypes.reverbEffectsSend,
             amt: 1000,
             secSrcEnum: 0x0,
             transform: 0
-        }),
-        // chorus effects to send
-        new Modulator({
+        }));
+    }
+    // chorus
+    if(modulators.find(m => m.modulatorDestination === generatorTypes.chorusEffectsSend) === undefined)
+    {
+        modulators.push(new Modulator({
             srcEnum: 0x00DD,
             dest: generatorTypes.chorusEffectsSend,
             amt: 1000,
             secSrcEnum: 0x0,
             transform: 0
-        }),
-    )
+        }));
+    }
 
     // it seems that dls 1 does not have vibrato lfo, so we shall disable it
     if(disableVibrato)

package/synthetizer/synthetizer.js

@@ -26,6 +26,8 @@ import { SoundfontManager } from './synth_soundfont_manager.js'
  * @property {boolean|undefined} oneOutput - if synth should use one output with 32 channels (2 audio channels for each midi channel). this disables chorus and reverb.
  */
 
+const CURRENT_SPESSASYNTH_VERSION = "3.20.9";
+
 export const WORKLET_PROCESSOR_NAME = "spessasynth-worklet-system";
 
 export const VOICE_CAP = 450;
@@ -218,10 +220,7 @@ export class Synthetizer {
      */
     set voiceCap(value)
     {
-        this.post({
-            messageType: workletMessageType.setMasterParameter,
-            messageData: [masterParameterType.voicesCap, value]
-        })
+        this._setMasterParam(masterParameterType.voicesCap, value);
         this._voiceCap = value;
     }
 
@@ -250,12 +249,37 @@ export class Synthetizer {
     setLogLevel(enableInfo, enableWarning, enableGroup, enableTable)
     {
         this.post({
-            channelNumber: -1,
+            channelNumber: ALL_CHANNELS_OR_DIFFERENT_ACTION,
             messageType: workletMessageType.setLogLevel,
             messageData: [enableInfo, enableWarning, enableGroup, enableTable]
         });
     }
 
+    /**
+     * @param type {masterParameterType}
+     * @param data {any}
+     * @private
+     */
+    _setMasterParam(type, data)
+    {
+        this.post({
+            channelNumber: ALL_CHANNELS_OR_DIFFERENT_ACTION,
+            messageType: workletMessageType.setMasterParameter,
+            messageData: [type, data]
+        })
+    }
+
+    /**
+     * Sets the interpolation type for the synthesizer:
+     * 0 - linear
+     * 1 - nearest neighbor
+     * @param type {interpolationTypes}
+     */
+    setInterpolationType(type)
+    {
+        this._setMasterParam(masterParameterType.interpolationType, type);
+    }
+
     /**
      * Handles the messages received from the worklet
      * @param message {WorkletReturnMessage}
@@ -300,6 +324,15 @@ export class Synthetizer {
             case returnMessageType.soundfontError:
                 SpessaSynthWarn(new Error(messageData));
                 this.eventHandler.callEvent("soundfonterror", messageData);
+                break;
+
+            case returnMessageType.identify:
+                if(messageData !== CURRENT_SPESSASYNTH_VERSION)
+                {
+                    this.stopAll(true);
+                    this.worklet.disconnect();
+                    throw new Error(`Outdated worklet_processor.min.js! version: ${messageData}. Please update it to ${CURRENT_SPESSASYNTH_VERSION}`);
+                }
         }
     }
 
@@ -563,11 +596,7 @@ export class Synthetizer {
      */
     setMainVolume(volume)
     {
-        this.post({
-            channelNumber: ALL_CHANNELS_OR_DIFFERENT_ACTION,
-            messageType: workletMessageType.setMasterParameter,
-            messageData: [masterParameterType.mainVolume, volume]
-        });
+        this._setMasterParam(masterParameterType.mainVolume, volume);
     }
 
     /**
@@ -576,11 +605,7 @@ export class Synthetizer {
      */
     setMasterPan(pan)
     {
-        this.post({
-            channelNumber: ALL_CHANNELS_OR_DIFFERENT_ACTION,
-            messageType: workletMessageType.setMasterParameter,
-            messageData: [masterParameterType.masterPan, pan]
-        });
+        this._setMasterParam(masterParameterType.masterPan, pan);
     }
 
     /**