Merge branch 'main' into glossing/fm-modulation

Make the scaling by freq in FM a separate node so that modulators behave like the fm control
Merge pull request 'Bug fix: Properly handle subcontrols' (#1877 ) from glossing/subcontrols into main
2026-09-18 03:24:45 -04:00 · 2026-01-09 03:31:26 +01:00 · 2026-01-08 20:28:53 -06:00 · 2026-01-09 02:53:37 +01:00
1 changed files with 5 additions and 4 deletions
@@ -461,10 +461,11 @@ export function applyFM(param, value, begin) {
          nodes[`fm_${idx}`] = [osc];
        }
        const { input, output, freq, osc, toCleanup } = fms[idx];
-        const g = gainNode(amt * freq);
-        io.push(isMod ? output.connect(g) : input);
-        cleanupOnEnd(osc, [...toCleanup, g]);
-        nodes[`fm_${idx}_gain`] = [g];
+        const gAmt = gainNode(amt);
+        const gFreq = gainNode(freq);
+        io.push(isMod ? output.connect(gAmt).connect(gFreq) : input);
+        cleanupOnEnd(osc, [...toCleanup, gAmt, gFreq]);
+        nodes[`fm_${idx}_gain`] = [gAmt];
      }
      if (!io[1]) {
        logger(
Author	SHA1	Message	Date
Aria	c7e88e1ff2	Merge branch 'main' into glossing/fm-modulation	2026-01-09 03:31:26 +01:00
Aria	f6a43f1b10	Make the scaling by freq in FM a separate node so that modulators behave like the fm control	2026-01-08 20:28:53 -06:00
Aria	a3b183d304	Merge pull request 'Bug fix: Properly handle subcontrols' (#1877 ) from glossing/subcontrols into main Reviewed-on: https://codeberg.org/uzu/strudel/pulls/1877	2026-01-09 02:53:37 +01:00