spessasynth_core 3.27.3 → 3.27.5

package/package.json

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

package/src/soundfont/basic_soundfont/modulator.js

@@ -34,6 +34,20 @@ export const modulatorCurveTypes = {
     switch: 3
 };
 
+
+export function getModSourceEnum(curveType, polarity, direction, isCC, index)
+{
+    return (curveType << 10) | (polarity << 9) | (direction << 8) | (isCC << 7) | index;
+}
+
+const defaultResonantModSource = getModSourceEnum(
+    modulatorCurveTypes.linear,
+    1,
+    0,
+    1,
+    midiControllers.filterResonance
+); // linear forwards bipolar cc 74
+
 export class Modulator
 {
     /**
@@ -70,9 +84,18 @@ export class Modulator
      * - still can be disabled if the soundfont has its own modulator curve
      * - this fixes the very low amount of reverb by default and doesn't break soundfonts
      * @type {boolean}
+     * @readonly
      */
     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}
+     * @readonly
+     */
+    isDefaultResonantModulator = false;
+    
     /**
      * 1 if the source is bipolar (min is -1, max is 1)
      * otherwise min is 0 and max is 1
@@ -151,6 +174,7 @@ export class Modulator
      * @param amount {number}
      * @param transformType {0|2}
      * @param isEffectModulator {boolean}
+     * @param isDefaultResonantModulator {boolean}
      */
     constructor(sourceIndex,
                 sourceCurveType,
@@ -165,7 +189,8 @@ export class Modulator
                 destination,
                 amount,
                 transformType,
-                isEffectModulator = false)
+                isEffectModulator = false,
+                isDefaultResonantModulator = false)
     {
         this.sourcePolarity = sourcePolarity;
         this.sourceDirection = sourceDirection;
@@ -183,6 +208,7 @@ export class Modulator
         this.transformAmount = amount;
         this.transformType = transformType;
         this.isEffectModulator = isEffectModulator;
+        this.isDefaultResonantModulator = isDefaultResonantModulator;
         
         
         if (this.modulatorDestination > MAX_GENERATOR)
@@ -212,7 +238,8 @@ export class Modulator
             modulator.modulatorDestination,
             modulator.transformAmount,
             modulator.transformType,
-            modulator.isEffectModulator
+            modulator.isEffectModulator,
+            modulator.isDefaultResonantModulator
         );
     }
     
@@ -327,7 +354,8 @@ export class Modulator
             this.modulatorDestination,
             this.transformAmount + modulator.transformAmount,
             this.transformType,
-            this.isEffectModulator
+            this.isEffectModulator,
+            this.isDefaultResonantModulator
         );
     }
 }
@@ -385,16 +413,19 @@ export class DecodedModulator extends Modulator
                 this.modulatorDestination === generatorTypes.reverbEffectsSend
                 || this.modulatorDestination === generatorTypes.chorusEffectsSend
             );
+        
+        
+        this.isDefaultResonantModulator = (
+            sourceEnum === defaultResonantModSource
+            && secondarySourceEnum === 0x0
+            && this.modulatorDestination === generatorTypes.initialFilterQ
+        );
     }
 }
 
 export const DEFAULT_ATTENUATION_MOD_AMOUNT = 960;
 export const DEFAULT_ATTENUATION_MOD_CURVE_TYPE = modulatorCurveTypes.concave;
 
-export function getModSourceEnum(curveType, polarity, direction, isCC, index)
-{
-    return (curveType << 10) | (polarity << 9) | (direction << 8) | (isCC << 7) | index;
-}
 
 const soundFontModulators = [
     // vel to attenuation
@@ -533,20 +564,15 @@ const customModulators = [
         0
     ),
     
-    // cc 71 (filter Q) to filter Q
+    // cc 71 (filter Q) to filter Q (default resonant modulator)
     new DecodedModulator(
-        getModSourceEnum(
-            modulatorCurveTypes.linear,
-            1,
-            0,
-            1,
-            midiControllers.filterResonance
-        ), // linear forwards bipolar cc 74
+        defaultResonantModSource,
         0x0, // no controller
         generatorTypes.initialFilterQ,
         250,
         0
     )
+
 ];
 
 /**

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.isDefaultResonantModulator)
+    {
+        // 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)