From 31fa523b7ed71c6fbbc0c4b2558fb83bf636fc88 Mon Sep 17 00:00:00 2001 From: Vance Ingalls Date: Thu, 13 Aug 2026 10:07:55 -0700 Subject: [PATCH] =?UTF-8?q?feat:=20offer=20the=20job,=20not=20the=20machin?= =?UTF-8?q?e=20=E2=80=94=20the=20range=20IS=20the=20module=20(#3185)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(studio): close the typecheck and fallow gaps wa-18b-reschedule opened useAutomationLanes.ts's write() assumed gesture-scoped coalescing and a preview-only commit that useDomEditAttributeCommits.ts never grew — backported that option support from its own later commit so the two sides of the API agree. The paste path and its tests were missing the box selection's v0/v1 bounds a sibling commit added to AutomationSelection. The FX panel's carve controls still edited the six mechanism numbers (maxCutDb, bands, intelligibilityBias) after carveProfile() collapsed authoring to one Strength knob, so those fields no longer existed on HfCarveSettings; UI now edits strength, and analyseCarveBands is called with carveProfile(strength). Also closes fallow's complexity, dead-code and duplication findings on this PR's diff: extracted automationLaneDragMath.ts (pure group/point-move math) and useAutomationRangeDrag.ts (the marquee-select gesture) out of useAutomationLaneGestures.ts, pulled a couple of render-loop ternaries and a resolver into named functions, dropped an export nothing outside its file used, and shared a step-simplifier between audioCarve's two envelope builders. The edge-stretch vs. box-select priority test in TimelineAutomationLane.test was still pinning the pre-box-select rule (edge wins over a point sitting on it) that a sibling commit deliberately reversed — a point inside the box is now selected content, so grabbing it drags the group instead. Updated the test to the shipped rule instead of the old one. Co-Authored-By: Claude Opus 5 (1M context) * fix(core): cap the via conic's weight so an edge-clamped via point can't NaN A via point pulled out past the segment (viaX: 5, viaY: -3) clamps to (0.999, 0.001) — exactly on the steady region's edge, where edge - viaX is 0. viaConic divided by that zero to get an infinite weight, and shapeVia turned Infinity into NaN a few steps later (Infinity - Infinity in the quadratic coefficient). NaN reaching setValueCurveAtTime silences the automated parameter for the rest of the render. Capped the weight at 1e6 instead of leaving it unbounded — past that point the arc already reads as touching the via point, so nothing visible is lost. Also hardened shapeVia's existing denominator guard (`<= 0`) to `!(> 0)`, since NaN fails the original comparison and fell through it. Review by Miga (PR #3208). * fix(studio-server): fingerprint the proactive waveform cache key too The route already keys the waveform cache on the asset's size and mtime as well as its path, so a rebuilt-in-place file gets fresh peaks instead of stale ones. generateWaveformCache — the proactive path that runs on upload — still called buildWaveformCacheKey with the path alone, so it wrote to a different key than the route reads from (making the pre-generated cache never found) and kept the exact collision bug this fingerprint exists to fix on its own path. Review by Miga (PR #3211). * style(docs): run oxfmt on the /hyperframes-audio skill docs Table column widths had drifted out of alignment with oxfmt's own rules, failing format:check and blocking the Preflight gate every downstream branch inherits. Whitespace only, no content change. * fix(core): stop \b from missing underscore-separated names, guard clipsOverlap's negative duration \b treats `_` as a word character, so \bbed\b never matched bed_01, music_bed_loop, or theme_song, and \bvo\b/\bvox\b/\btts\b had the same gap — an underscore-separated bed classified as "unknown" and could end up offered as its own carve source. Replaced the short hints with a boundary that actually excludes letters and digits on both sides. clipsOverlap computed end = start + duration without guarding sign, so a negative duration put end before start — an interval that does not describe anything, and one specific case showed it silently dropping a real overlap (a shorter, earlier broken end rejected a clip that genuinely contained the point). Duration clamps to zero instead: a clip cannot un-play time, and a zero-length clip at its start is the sane reading of "duration nobody wrote down as positive." Review by Miga (PR #3212). * fix(studio): widen PropertyPanel's resetModules render timeout again The 20s margin (already once widened for the same reason) is timing out in CI's full-monorepo Test run — the resetModules()+fresh-import render this test needs is uncached and competes with every other package's test suite for the same worker pool, and the same test passes in well under 2s standalone. Went to 45s rather than re-tuning to whatever number happens to clear the current CI load, since that number moves every time CI gains a package. * fix(studio): stop the single-candidate auto-apply carve firing twice Two auto-apply effects both fire when sourceOptions.length === 1: the multi-candidate effect only guards length === 0, so a single candidate passes it too, and the single-candidate effect passes its own guard right after — both compute the same sources list and both call setCarve, so the common case (one narrator, one bed) triggered two decodes, two FFT runs, and two concurrent attribute writes for one decision. The multi-candidate effect now defers to its sibling for exactly one candidate, which already has its own detailed handling for that case. Review by Miga (PR #3213). * feat(core): carve against every voice over a bed, always (#3212) * feat(core): carve against every voice over a bed, always dynamically A bed usually runs under a whole sequence — a narrator, an interview answer, a second presenter — and carving against one of them left the others fighting it. `source` becomes `sources`, and `mixCarveSources` sums every voice onto the BED's clock before anything is measured. That is what keeps one analysis sufficient: the chain is fixed, so there is no per-voice filter to switch between, and bands drawn from all the speech there is with envelopes that rise wherever any of it happens answer the actual question — where and when is speech masking this bed. Summed rather than averaged: two people talking at once mask more than either alone. Audio before the bed starts is dropped rather than folded in at zero, since it plays over nothing and shifting it would put a cut where there is no voice. `dynamic` is gone. A fixed depth thins the bed through every pause, and once both have been heard there is no reason to want it, so every carve follows the speech. Two helpers the panel and the headless script now share instead of each carrying a copy — two definitions of "what does this name suggest" drift, and then the two disagree about which track is the voice: - `classifyAudioName` reads a track's kind from its id and filename together. `unknown` is deliberately common: treating an unrecognised name as "not a voice" would hide the one track somebody needs to pick. - `clipsOverlap` keeps out a voice that never plays while the bed does. An unwritten duration counts as unbounded, not zero — refusing a clip whose length the composition leaves to the media would drop the commonest case there is. Files written before this still load: a single `source` reads as a one-voice list, a stored `dynamic` is ignored, and an absent attribute means the defaults whole. Co-Authored-By: Claude Opus 5 (1M context) * fix(core): stop \b from missing underscore-separated names, guard clipsOverlap's negative duration \b treats `_` as a word character, so \bbed\b never matched bed_01, music_bed_loop, or theme_song, and \bvo\b/\bvox\b/\btts\b had the same gap — an underscore-separated bed classified as "unknown" and could end up offered as its own carve source. Replaced the short hints with a boundary that actually excludes letters and digits on both sides. clipsOverlap computed end = start + duration without guarding sign, so a negative duration put end before start — an interval that does not describe anything, and one specific case showed it silently dropping a real overlap (a shorter, earlier broken end rejected a clip that genuinely contained the point). Duration clamps to zero instead: a clip cannot un-play time, and a zero-length clip at its start is the sane reading of "duration nobody wrote down as positive." Review by Miga (PR #3212). --------- Co-authored-by: Claude Opus 5 (1M context) * fix(studio): port the carve UI off the removed source/dynamic fields #3212 (accidentally squash-merged into this branch instead of main) changed HfCarveSettings from a single `source` + `dynamic` toggle to a `sources` list with dynamic mode removed outright — the multi-voice UI consumer that goes with that shape lands in the very next PR, so this branch was left with a type that no longer matched its own code. Minimal port, not the multi-voice redesign that PR does properly: the "Listen to" picker and analyse() treat sources[0] as the one voice this UI still understands, and every dynamic-mode branch (the automated envelope lanes, the toggle, the checkbox) is gone along with the field — a carve is now always the static value the analysis computes, matching what the type change made permanent. Test suite trimmed the same way: the automation-lane and toggle tests covered behavior that no longer exists. --------- Co-authored-by: Claude Opus 5 (1M context) --- packages/core/package-subpaths.json | 6 + packages/core/package.json | 10 ++ packages/core/src/audioFxJobs.test.ts | 63 ++++++++++ packages/core/src/audioFxJobs.ts | 117 ++++++++++++++++++ .../editor/propertyPanelAudioFxGroup.test.tsx | 4 +- .../editor/propertyPanelFxSection.test.tsx | 62 +++++++++- .../editor/propertyPanelFxSection.tsx | 75 ++++++++++- 7 files changed, 327 insertions(+), 10 deletions(-) create mode 100644 packages/core/src/audioFxJobs.test.ts create mode 100644 packages/core/src/audioFxJobs.ts diff --git a/packages/core/package-subpaths.json b/packages/core/package-subpaths.json index 426423cf8..add772f9b 100644 --- a/packages/core/package-subpaths.json +++ b/packages/core/package-subpaths.json @@ -104,6 +104,12 @@ "types": "./dist/audioFxCopy.d.ts", "environments": ["browser", "bun", "node"] }, + "./audio-fx-jobs": { + "source": "./src/audioFxJobs.ts", + "runtime": "./dist/audioFxJobs.js", + "types": "./dist/audioFxJobs.d.ts", + "environments": ["browser", "bun", "node"] + }, "./audio-fx-eq": { "source": "./src/audioFxEq.ts", "runtime": "./dist/audioFxEq.js", diff --git a/packages/core/package.json b/packages/core/package.json index ea0c3cc05..04a9958f3 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -118,6 +118,12 @@ "import": "./src/audioFxCopy.ts", "types": "./src/audioFxCopy.ts" }, + "./audio-fx-jobs": { + "bun": "./src/audioFxJobs.ts", + "node": "./dist/audioFxJobs.js", + "import": "./src/audioFxJobs.ts", + "types": "./src/audioFxJobs.ts" + }, "./audio-fx-eq": { "bun": "./src/audioFxEq.ts", "node": "./dist/audioFxEq.js", @@ -430,6 +436,10 @@ "import": "./dist/audioFxCopy.js", "types": "./dist/audioFxCopy.d.ts" }, + "./audio-fx-jobs": { + "import": "./dist/audioFxJobs.js", + "types": "./dist/audioFxJobs.d.ts" + }, "./audio-fx-eq": { "import": "./dist/audioFxEq.js", "types": "./dist/audioFxEq.d.ts" diff --git a/packages/core/src/audioFxJobs.test.ts b/packages/core/src/audioFxJobs.test.ts new file mode 100644 index 000000000..4b31cc05d --- /dev/null +++ b/packages/core/src/audioFxJobs.test.ts @@ -0,0 +1,63 @@ +import { describe, expect, it } from "vitest"; +import { getAudioFxDef } from "./audioFx.js"; +import { HF_AUDIO_FX_PRESETS } from "./audioFxPresets.js"; +import { audioFxJobNode, getAudioFxJob, HF_AUDIO_FX_JOBS } from "./audioFxJobs.js"; + +const EMPTY = { version: 1 as const, nodes: [] }; + +describe("named jobs", () => { + it("makes an ordinary effect node, named for the work", () => { + const job = getAudioFxJob("reduce-mud"); + if (!job) throw new Error("no such job"); + const node = audioFxJobNode(job, EMPTY); + // Ordinary underneath: the author can open it and find the filter they could + // have added by hand, at the frequency the job picked for them. + expect(node.type).toBe("peaking"); + expect(node.params?.frequency).toBe(250); + expect(node.label).toBe("Reduce Mud"); + expect(node.enabled).toBe(true); + expect(node.id).toBeTruthy(); + }); + + it("gives every job a value for every parameter its effect declares", () => { + // A job names a range and leaves the rest alone, so the omitted parameters + // have to come from the registry — a node missing `q` renders at whatever + // the graph builder falls back to rather than what the panel shows. + for (const job of HF_AUDIO_FX_JOBS) { + const def = getAudioFxDef(job.type); + expect(def, `${job.id} names an effect that does not exist`).toBeDefined(); + const node = audioFxJobNode(job, EMPTY); + for (const param of def?.params ?? []) { + expect(node.params?.[param.key], `${job.id} has no ${param.key}`).toBeDefined(); + } + } + }); + + it("mints an id that does not collide with what is already there", () => { + const job = getAudioFxJob("add-clarity"); + if (!job) throw new Error("no such job"); + const first = audioFxJobNode(job, EMPTY); + const second = audioFxJobNode(job, { version: 1, nodes: [first] }); + // Two of the same job is a real thing to want, and a shared id would give + // them each other's automation lanes. + expect(second.id).not.toBe(first.id); + }); + + it("names jobs the preset catalogue already ships", () => { + // The point of the list is to name the vocabulary the presets were written + // in, not to invent a second one beside it. A job nobody's preset uses is a + // guess about what authors want; one a preset uses has already been chosen. + const shipped = new Set( + HF_AUDIO_FX_PRESETS.flatMap((preset) => preset.nodes.map((node) => node.label)), + ); + for (const job of HF_AUDIO_FX_JOBS) { + expect(shipped, `${job.label} is not a job any preset does`).toContain(job.label); + } + }); + + it("has an id for every job and no duplicates", () => { + const ids = HF_AUDIO_FX_JOBS.map((job) => job.id); + expect(new Set(ids).size).toBe(ids.length); + for (const id of ids) expect(getAudioFxJob(id)?.id).toBe(id); + }); +}); diff --git a/packages/core/src/audioFxJobs.ts b/packages/core/src/audioFxJobs.ts new file mode 100644 index 000000000..fe619c53a --- /dev/null +++ b/packages/core/src/audioFxJobs.ts @@ -0,0 +1,117 @@ +/** + * Named jobs: the range IS the module. + * + * "Shape One Range" has three controls — where, how much, how wide — and no + * honest way to nominate one of them as the knob that matters. Nominating *how + * much* is incoherent, because boosting an unspecified frequency means nothing: + * the range is the first decision, not the second. + * + * So the menu offers the decision instead of the machine. Each job is a peaking + * filter with its frequency already chosen — Reduce Mud, Add Clarity, Soften + * Harshness — and picking the module IS picking the range, which makes one knob + * honest rather than a simplification hiding the real choice. It also dissolves + * the duplicate-name problem at the root: a preset that cuts mud and then lifts + * clarity used to read "Shape One Range" twice with nothing to tell them apart. + * + * Every job here is one the preset catalogue already ships, at the settings it + * ships them with, so this names the vocabulary the presets were written in + * rather than inventing a second one. Reasoning in + * `plans/audio-fx-ux/README.md` §"The hole in the single-knob rule". + * + * The frequency is a starting point, not a cage — it is an ordinary peaking node + * underneath, and Details opens on the same three controls it always had. + */ + +import { + defaultAudioFxParams, + mintAudioFxNodeId, + normalizeAudioFxParams, + type HfAudioFxChain, + type HfAudioFxNode, + type HfAudioFxParamValues, +} from "./audioFx.js"; + +export interface HfAudioFxJob { + id: string; + /** What the rack calls the node this makes. */ + label: string; + /** The complaint that leads here, in the author's words. */ + does: string; + /** The registry effect underneath. */ + type: string; + /** Where it acts, and how hard — the decision the author is spared. */ + params: HfAudioFxParamValues; +} + +/** + * Ordered low to high, which is the order an author hears them in: weight and + * mud at the bottom, clarity and harshness at the top. + */ +export const HF_AUDIO_FX_JOBS: readonly HfAudioFxJob[] = [ + { + id: "tame-boominess", + label: "Tame Boominess", + does: "Too much chest — it booms.", + type: "peaking", + params: { frequency: 200, gain: -4, q: 1.4 }, + }, + { + id: "reduce-mud", + label: "Reduce Mud", + does: "Muffled, like it is behind cardboard.", + type: "peaking", + params: { frequency: 250, gain: -3, q: 1.2 }, + }, + { + id: "reduce-boxiness", + label: "Reduce Boxiness", + does: "Sounds like a small room, or a box.", + type: "peaking", + params: { frequency: 400, gain: -3, q: 1.4 }, + }, + { + id: "add-clarity", + label: "Add Clarity", + does: "Words are hard to make out.", + type: "peaking", + params: { frequency: 3000, gain: 2.5, q: 1 }, + }, + { + id: "soften-harshness", + label: "Soften Harshness", + does: "Harsh and tiring to listen to.", + type: "peaking", + params: { frequency: 3200, gain: -3, q: 1.6 }, + }, +]; + +export function getAudioFxJob(id: string): HfAudioFxJob | undefined { + return HF_AUDIO_FX_JOBS.find((job) => job.id === id); +} + +/** Effect ids the job list covers, which the add menu offers as jobs instead. */ +export const HF_AUDIO_FX_JOB_TYPES: ReadonlySet = new Set( + HF_AUDIO_FX_JOBS.map((job) => job.type), +); + +/** + * The node a job adds: an ordinary effect carrying the job's name. + * + * `label` is the field a preset already uses to name a node for the work it + * does, so a job needs nothing new — and a job node and a preset node are + * indistinguishable afterwards, which is right. They are the same idea. + */ +export function audioFxJobNode(job: HfAudioFxJob, chain: HfAudioFxChain): HfAudioFxNode { + return { + type: job.type, + id: mintAudioFxNodeId(chain), + enabled: true, + label: job.label, + // Through the registry, so a job cannot ship a value the effect would clamp + // or a key it does not have. + params: normalizeAudioFxParams(job.type, { + ...defaultAudioFxParams(job.type), + ...job.params, + }), + }; +} diff --git a/packages/studio/src/components/editor/propertyPanelAudioFxGroup.test.tsx b/packages/studio/src/components/editor/propertyPanelAudioFxGroup.test.tsx index 5e4663cce..c4e7fc51b 100644 --- a/packages/studio/src/components/editor/propertyPanelAudioFxGroup.test.tsx +++ b/packages/studio/src/components/editor/propertyPanelAudioFxGroup.test.tsx @@ -456,7 +456,9 @@ describe("AudioFxGroup dynamic carve", () => { act(() => byTextButton(host, "Even Out Levels")?.focus()); // Straight to a neighbour, without ever leaving the shelf. act(() => - byTextButton(host, "Reverb")?.dispatchEvent(new MouseEvent("mouseover", { bubbles: true })), + byTextButton(host, EFFECT_COPY.reverb?.title ?? "")?.dispatchEvent( + new MouseEvent("mouseover", { bubbles: true }), + ), ); await settleDecode(release, decoded); diff --git a/packages/studio/src/components/editor/propertyPanelFxSection.test.tsx b/packages/studio/src/components/editor/propertyPanelFxSection.test.tsx index 94c01caee..45370f877 100644 --- a/packages/studio/src/components/editor/propertyPanelFxSection.test.tsx +++ b/packages/studio/src/components/editor/propertyPanelFxSection.test.tsx @@ -9,6 +9,7 @@ import { } from "@hyperframes/core/audio-fx"; import { DEFAULT_CARVE } from "@hyperframes/core/audio-carve"; import { EFFECT_COPY, PRESET_PROBLEM } from "@hyperframes/core/audio-fx-copy"; +import { HF_AUDIO_FX_JOBS, HF_AUDIO_FX_JOB_TYPES } from "@hyperframes/core/audio-fx-jobs"; import { getAudioFxPreset } from "@hyperframes/core/audio-fx-presets"; /** @@ -152,14 +153,65 @@ describe("FxSection chain", () => { // change to the panel. const { host } = mount(); const items = openAddMenuItems(host); - expect(items).toHaveLength(HF_AUDIO_FX.length); - for (const def of HF_AUDIO_FX) expect(items).toContain(def.label); + // Every effect is reachable, but not every one under its own name: the jobs + // stand in for the effect they are made of, because picking `peaking` is + // picking a machine and leaving the real decision for afterwards. + const standIns = HF_AUDIO_FX.filter((d) => HF_AUDIO_FX_JOB_TYPES.has(d.id)); + expect(items).toHaveLength(HF_AUDIO_FX.length - standIns.length + HF_AUDIO_FX_JOBS.length); + for (const def of HF_AUDIO_FX) { + if (HF_AUDIO_FX_JOB_TYPES.has(def.id)) { + // Not offered as itself, and it must not be — two doors to the same + // effect, one of them the incoherent one, is worse than either alone. + expect(items).not.toContain(EFFECT_COPY[def.id]?.title); + continue; + } + // By the name the RACK will use, not the registry's — picking "High-pass" + // and getting a module called "Remove Rumble" is the inconsistency this + // whole layer exists to remove. + expect(items).toContain(EFFECT_COPY[def.id]?.title); + } + for (const job of HF_AUDIO_FX_JOBS) expect(items).toContain(job.label); + }); + + it("adds a job as an ordinary effect, already named and already aimed", () => { + // The range IS the module: one knob is honest here because the decision the + // knob depends on has already been made. + const { host, onChainChange } = mount({ chain: { version: 1, nodes: [] } }); + click(host.querySelector(".hf-fx-add")); + click(byText(host, ".hf-fx-add-item", "Reduce Mud")); + + const next = onChainChange.mock.calls[0]?.[0] as HfAudioFxChain; + expect(next.nodes).toHaveLength(1); + expect(next.nodes[0]?.type).toBe("peaking"); + expect(next.nodes[0]?.label).toBe("Reduce Mud"); + expect(next.nodes[0]?.params?.frequency).toBe(250); + }); + + it("shows two jobs over the same effect as the different things they are", () => { + // The whole point. Read down the rack, "Shape One Range" twice was two rows + // an author could not tell apart — and one of them was cutting while the + // other was boosting. + const { host } = mount({ + chain: { + version: 1, + nodes: [ + { type: "peaking", label: "Reduce Mud", params: { frequency: 250, gain: -3, q: 1.2 } }, + { type: "peaking", label: "Add Clarity", params: { frequency: 3000, gain: 2.5, q: 1 } }, + ], + } as unknown as HfAudioFxChain, + }); + const names = Array.from(host.querySelectorAll(".hf-fx-node-name")).map((e) => + e.textContent?.trim(), + ); + expect(names).toContain("Reduce Mud"); + expect(names).toContain("Add Clarity"); + expect(names).not.toContain(EFFECT_COPY.peaking?.title); }); it("adds an effect seeded with its declared defaults", () => { const { host, onChainChange } = mount(); click(host.querySelector(".hf-fx-add")); - click(byText(host, ".hf-fx-add-item", "Compressor")); + click(byText(host, ".hf-fx-add-item", EFFECT_COPY.compressor?.title ?? "")); expect(onChainChange).toHaveBeenCalledTimes(1); const next = onChainChange.mock.calls[0]![0] as HfAudioFxChain; expect(next.nodes).toHaveLength(1); @@ -393,7 +445,7 @@ describe("FxSection chain", () => { it("auditions an effect the add menu is offering", () => { const { host, onChainPreview, onChainChange } = mount({ chain: chainOf("peaking") }); click(byText(host, "button", "Add effect")); - enter(byText(host, "button", "Reverb")); + enter(byText(host, "button", EFFECT_COPY.reverb?.title ?? "")); const heard = onChainPreview.mock.calls.at(-1)?.[0] as HfAudioFxChain; expect(heard.nodes.map((n) => n.type)).toEqual(["peaking", "reverb"]); @@ -1045,7 +1097,7 @@ describe("automation in the panel", () => { const add = host.querySelector(".hf-fx-add") as HTMLButtonElement; act(() => add.click()); const item = Array.from(host.querySelectorAll(".hf-fx-add-item")).find( - (b) => b.textContent === "Low-pass", + (b) => b.textContent === EFFECT_COPY.lowpass?.title, )!; act(() => item.click()); expect(onChainChange.mock.calls[0][0].nodes[0].id).toBe("n1"); diff --git a/packages/studio/src/components/editor/propertyPanelFxSection.tsx b/packages/studio/src/components/editor/propertyPanelFxSection.tsx index 5e2627123..76387a9a1 100644 --- a/packages/studio/src/components/editor/propertyPanelFxSection.tsx +++ b/packages/studio/src/components/editor/propertyPanelFxSection.tsx @@ -8,6 +8,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { defaultAudioFxParams, + getAudioFxDef, HF_AUDIO_FX, mintAudioFxNodeId, type HfAudioFxChain, @@ -24,6 +25,13 @@ import { removeAudioEq, setAudioEqBandGain, } from "@hyperframes/core/audio-fx-eq"; +import { EFFECT_COPY } from "@hyperframes/core/audio-fx-copy"; +import { + audioFxJobNode, + HF_AUDIO_FX_JOBS, + HF_AUDIO_FX_JOB_TYPES, + type HfAudioFxJob, +} from "@hyperframes/core/audio-fx-jobs"; import { FxPresetMenu } from "./propertyPanelFxPresetMenu.js"; import { FxEqModule } from "./propertyPanelFxEqModule.js"; import { FxCarveModule, type AudioTrackOption } from "./propertyPanelFxCarveModule.js"; @@ -132,8 +140,20 @@ export function FxSection({ const [picking, setPicking] = useState(false); const [openNode, setOpenNode] = useState(0); + /** + * The add menu, with the jobs standing in for the effect they are made of. + * + * `peaking` is not offered as itself: picking it is picking a machine and + * leaving the real decision — which range — for afterwards. The jobs are that + * decision, already made. See `audioFxJobs.ts`. + */ const grouped = useMemo( - () => GROUP_ORDER.map((g) => ({ group: g, defs: HF_AUDIO_FX.filter((d) => d.group === g) })), + () => + GROUP_ORDER.map((g) => ({ + group: g, + defs: HF_AUDIO_FX.filter((d) => d.group === g && !HF_AUDIO_FX_JOB_TYPES.has(d.id)), + jobs: HF_AUDIO_FX_JOBS.filter((job) => getAudioFxDef(job.type)?.group === g), + })), [], ); @@ -207,6 +227,7 @@ export function FxSection({ }, [], ); + const applyPreset = useCallback( (id: string) => { const preset = getAudioFxPreset(id); @@ -239,6 +260,26 @@ export function FxSection({ }), [], ); + + /** The same, for a job — an ordinary node that arrives already named and aimed. */ + const withJob = useCallback( + (base: HfAudioFxChain, job: HfAudioFxJob): HfAudioFxChain => ({ + ...base, + nodes: [...base.nodes, audioFxJobNode(job, base)], + }), + [], + ); + + const addJob = useCallback( + (job: HfAudioFxJob) => { + auditionBase.current = null; + mutate(withJob(chain, job).nodes); + setOpenNode(chain.nodes.length); + setAdding(false); + }, + [chain, mutate, withJob], + ); + const addEffect = useCallback( (type: string) => { auditionBase.current = null; @@ -472,17 +513,43 @@ export function FxSection({ Tone (EQ) - {grouped.map(({ group, defs }) => ( + {grouped.map(({ group, defs, jobs }) => (
{GROUP_LABEL[group]} + {jobs.map((job) => ( + + ))} {defs.map((d) => ( ))}