fix DLS attenuation modulators

package.json

@@ -1,6 +1,6 @@
 {
   "name": "SpessaSynth",
-  "version": "3.22.7",
+  "version": "3.22.8",
   "type": "module",
   "scripts": {
     "start": "node src/website/server/server.js",

src/spessasynth_lib/soundfont/dls/articulator_converter.js

@@ -4,6 +4,7 @@ import { midiControllers } from "../../midi_parser/midi_message.js";
 import { DLSDestinations } from "./dls_destinations.js";
 
 import { generatorTypes } from "../basic_soundfont/generator.js";
+import { consoleColors } from "../../utils/other.js";
 
 /**
  * @param source {number}
@@ -174,6 +175,48 @@ function checkForSpecialDLSCombo(source, destination)
     }
 }
 
+/**
+ * @param source {number}
+ * @param control {number}
+ * @param destination {number}
+ * @param value {number}
+ * @param transform {number}
+ */
+function modulatorConverterDebug(
+    source,
+    control,
+    destination,
+    value,
+    transform
+)
+{
+    const type = Object.keys(DLSDestinations).find(k => DLSDestinations[k] === destination);
+    const srcType = Object.keys(DLSSources).find(k => DLSSources[k] === source);
+    const ctrlType = Object.keys(DLSSources).find(k => DLSSources[k] === control);
+    const typeString = type ? type : destination.toString(16);
+    const srcString = srcType ? srcType : source.toString(16);
+    const ctrlString = ctrlType ? ctrlType : control.toString(16);
+    console.debug(
+        `%cAttempting to convert the following DLS Articulator to SF2 Modulator:
+        Source: %c${srcString}%c
+        Control: %c${ctrlString}%c
+        Destination: %c${typeString}%c
+        Amount: %c${value}%c
+        Transform: %c${transform}%c...`,
+        consoleColors.info,
+        consoleColors.recognized,
+        consoleColors.info,
+        consoleColors.recognized,
+        consoleColors.info,
+        consoleColors.recognized,
+        consoleColors.info,
+        consoleColors.recognized,
+        consoleColors.info,
+        consoleColors.recognized,
+        consoleColors.info
+    );
+}
+
 /**
  * @param source {number}
  * @param control {number}
@@ -202,6 +245,7 @@ export function getSF2ModulatorFromArticulator(
     let sf2Source;
     let swapSources = false;
     let isSourceNoController = false;
+    let newValue = value;
     if (specialDestination === undefined)
     {
         // determine destination
@@ -217,7 +261,7 @@ export function getSF2ModulatorFromArticulator(
         destinationGenerator = sf2GenDestination;
         if (sf2GenDestination.newAmount !== undefined)
         {
-            value = sf2GenDestination.newAmount;
+            newValue = sf2GenDestination.newAmount;
             destinationGenerator = sf2GenDestination.gen;
         }
         sf2Source = getSF2SourceFromDLS(source);
@@ -263,10 +307,22 @@ export function getSF2ModulatorFromArticulator(
         }
         const sourceIsBipolar = (transform >> 14) & 1;
         let sourceIsNegative = (transform >> 15) & 1;
-        // special case: for attenuation, invert source
+        // special case: for attenuation, invert source (dls gain is the opposite of sf2 attenuation)
         if (destinationGenerator === generatorTypes.initialAttenuation)
         {
-            sourceIsNegative = !sourceIsNegative;
+            // modulatorConverterDebug(
+            //     source,
+            //     control,
+            //     destination,
+            //     value,
+            //     transform
+            // );
+            // invert only if the actual transform value is not negative.
+            // if it is, it's already inverted
+            if (value > 0)
+            {
+                sourceIsNegative = !sourceIsNegative;
+            }
         }
         sourceEnumFinal = getModSourceEnum(
             sourceTransform,
@@ -301,7 +357,7 @@ export function getSF2ModulatorFromArticulator(
         secSrcEnum: secSourceEnumFinal,
         dest: destinationGenerator,
         transform: 0x0,
-        amt: value
+        amt: newValue
     });
 
 }

src/spessasynth_lib/soundfont/dls/read_articulation.js

@@ -7,47 +7,6 @@ import { consoleColors } from "../../utils/other.js";
 import { Generator, generatorTypes } from "../basic_soundfont/generator.js";
 import { Modulator } from "../basic_soundfont/modulator.js";
 
-/**
- * @param source {number}
- * @param control {number}
- * @param destination {number}
- * @param value {number}
- * @param transform {number}
- */
-function modulatorConverterDebug(
-    source,
-    control,
-    destination,
-    value,
-    transform
-)
-{
-    const type = Object.keys(DLSDestinations).find(k => DLSDestinations[k] === destination);
-    const srcType = Object.keys(DLSSources).find(k => DLSSources[k] === source);
-    const ctrlType = Object.keys(DLSSources).find(k => DLSSources[k] === control);
-    const typeString = type ? type : destination.toString(16);
-    const srcString = srcType ? srcType : source.toString(16);
-    const ctrlString = ctrlType ? ctrlType : control.toString(16);
-    SpessaSynthInfo(
-        `%cAttempting to convert the following DLS Articulator to SF2 Modulator:
-        Source: %c${srcString}%c
-        Control: %c${ctrlString}%c
-        Destination: %c${typeString}%c
-        Amount: %c${value}%c
-        Transform: %c${transform}%c...`,
-        consoleColors.info,
-        consoleColors.recognized,
-        consoleColors.info,
-        consoleColors.recognized,
-        consoleColors.info,
-        consoleColors.recognized,
-        consoleColors.info,
-        consoleColors.recognized,
-        consoleColors.info,
-        consoleColors.recognized,
-        consoleColors.info
-    );
-}
 
 /**
  * Reads the articulator chunk
@@ -80,7 +39,6 @@ export function readArticulation(chunk, disableVibrato)
         const scale = readLittleEndian(artData, 4) | 0;
         const value = scale >> 16; // convert it to 16 bit as soundfont uses that
 
-        // modulatorConverterDebug(source, control, destination, value, transform);
         // interpret this somehow...
         // if source and control are both zero, it's a generator
         if (source === 0 && control === 0 && transform === 0)