spessasynth_core 3.27.3 → 3.27.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_core",
-  "version": "3.27.3",
+  "version": "3.27.4",
   "description": "MIDI and SoundFont2/DLS library with no compromises",
   "main": "index.js",
   "type": "module",

package/src/soundfont/basic_soundfont/modulator.js

@@ -73,6 +73,13 @@ export class Modulator
      */
     isEffectModulator = false;
     
+    /**
+     * The default resonant modulator does not affect the filter gain.
+     * Neither XG nor GS responded to cc #74 in that way.
+     * @type {boolean}
+     */
+    isDefaultResonanceModulator = false;
+    
     /**
      * 1 if the source is bipolar (min is -1, max is 1)
      * otherwise min is 0 and max is 1
@@ -198,7 +205,7 @@ export class Modulator
      */
     static copy(modulator)
     {
-        return new Modulator(
+        const m = new Modulator(
             modulator.sourceIndex,
             modulator.sourceCurveType,
             modulator.sourceUsesCC,
@@ -214,6 +221,8 @@ export class Modulator
             modulator.transformType,
             modulator.isEffectModulator
         );
+        m.isDefaultResonanceModulator = modulator.isDefaultResonanceModulator;
+        return m;
     }
     
     /**
@@ -313,7 +322,7 @@ export class Modulator
      */
     sumTransform(modulator)
     {
-        return new Modulator(
+        const m = new Modulator(
             this.sourceIndex,
             this.sourceCurveType,
             this.sourceUsesCC,
@@ -329,6 +338,8 @@ export class Modulator
             this.transformType,
             this.isEffectModulator
         );
+        m.isDefaultResonanceModulator = modulator.isDefaultResonanceModulator;
+        return m;
     }
 }
 
@@ -531,23 +542,26 @@ const customModulators = [
         generatorTypes.initialFilterFc,
         6000,
         0
-    ),
-    
-    // cc 71 (filter Q) to filter Q
-    new DecodedModulator(
-        getModSourceEnum(
-            modulatorCurveTypes.linear,
-            1,
-            0,
-            1,
-            midiControllers.filterResonance
-        ), // linear forwards bipolar cc 74
-        0x0, // no controller
-        generatorTypes.initialFilterQ,
-        250,
-        0
     )
+
 ];
+// cc 71 (filter Q) to filter Q
+const resonanceModulator = new DecodedModulator(
+    getModSourceEnum(
+        modulatorCurveTypes.linear,
+        1,
+        0,
+        1,
+        midiControllers.filterResonance
+    ), // linear forwards bipolar cc 74
+    0x0, // no controller
+    generatorTypes.initialFilterQ,
+    250,
+    0
+);
+
+resonanceModulator.isDefaultResonanceModulator = true;
+customModulators.push(resonanceModulator);
 
 /**
  * @type {Modulator[]}

package/src/synthetizer/audio_engine/engine_components/compute_modulator.js

@@ -113,6 +113,13 @@ export function computeModulator(controllerTable, modulator, voice)
         computedValue = Math.abs(computedValue);
     }
     
+    // resonant modulator: take its value and ensure that it won't change the final gain
+    if (modulator.isDefaultResonanceModulator)
+    {
+        // half the gain, negates the filter
+        voice.resonanceOffset = Math.max(0, computedValue / 2);
+    }
+    
     modulator.currentValue = computedValue;
     return computedValue;
 }

package/src/synthetizer/audio_engine/engine_components/voice.js

@@ -143,6 +143,12 @@ class Voice
      */
     modulators = [];
     
+    /**
+     * Resonance offset, it is affected by the default resonant modulator
+     * @type {number}
+     */
+    resonanceOffset = 0;
+    
     /**
      * The generators in real-time, affected by modulators.
      * This is used during rendering.
@@ -290,7 +296,6 @@ class Voice
         this.modulatedGenerators = new Int16Array(generators);
         this.modulators = modulators;
         this.filter = new LowpassFilter(sampleRate);
-        
         this.velocity = velocity;
         this.midiNote = midiNote;
         this.startTime = currentTime;
@@ -452,8 +457,6 @@ export function getVoicesForPreset(preset, bank, program, midiNote, velocity, re
             //     MidiNote: midiNote,
             //     AudioSample: audioSample
             // }]);
-            
-            
             voices.push(
                 new Voice(
                     this.sampleRate,

package/src/synthetizer/audio_engine/engine_methods/render_voice.js

@@ -160,6 +160,9 @@ export function renderVoice(
         cents += modEnv * modEnvPitchDepth;
     }
     
+    // default resonant modulator: it does not affect the filter gain (neither XG nor GS did that)
+    volumeExcursionCentibels -= voice.resonanceOffset;
+    
     // finally, calculate the playback rate
     const centsTotal = ~~(cents + semitones * 100);
     if (centsTotal !== voice.currentTuningCents)