Refactoring round 10 covers everything since round 9 (808e1ee): 110 commits with about 47 000 new lines, nearly all of them sound, sound FX, instruments, patterns and songs. Behaviour is unchanged. Duplicate code (jscpd over src, 50 tokens, TypeScript only, measured on808e1eeand here alike: 47 clones / 426 lines before, 33 / 245 after; round 9 itself ended at 22 / 160 by this count): - PreviewParams (new, editor/soundfx) is the header's parameter bar of the Sound FX and the Instrument tab: values, defaults, fields and the voices a moved field reaches. Both tabs had it line for line. - fxWorklet: an Effect base runs the bit crusher, phaser, flanger, limiter, LFO and bus shifter, a Source base the pitch player and the Chip. Start is the one wait for a voice's first sample, which four processors wrote out each. - nodes/shared has checkPort, detachedPort, fxParamsPort and letRingPort. The Play and Stop nodes of sounds, notes, patterns and songs spelled each port out, up to five times. - parameterValues builds both Sound FX parameters and Instrument parameters, which differed in name and text only. - SetLoopCommand sets the ruler loop of a pattern or a song. It replaces SetPatternLoopCommand and SetSongLoopCommand. - addLink in music/routing is the one rule for a link that both the song routing and the Master routing keep. - eqCurves works out each band and their sum for the EQ tab, which did that in its drawing code. It replaces eqCurveDb, which only a test called. - Smaller ones: the eight neighbour directions of a tile cell, and drawFloatingBox for the shadowed box of Popup and FloatWindow. - Left on purpose: Play pattern and Play song stay two parallel node definitions, and the smaller clones under ten lines stay. Architecture: - SoundLibrary.ts goes from 2897 to 2188 lines. What a stage of a sound FX becomes as Web Audio nodes, and how the knobs of a playing voice move, is now viewport/fxNodes.ts. None of it keeps state of the library. Dead code (TS language service, references per export and member): - soundRefIds, LFO_SHAPE_INDEX, TREMOLO_ROWS, VIBRATO_ROWS and REVERB_ROWS had no reader. The four routing node defs are registered without an unused exported name. - soundFileOf and portTypeOf were called by tests only. The tests now ask findSound and portOf, which the editor uses. DRY moves from src into the one test that uses it. - 51 values used only in their own file lose their `export`. Types and the node catalogues stay exported. - Kept on purpose: neighboursOf is the cell by cell reading the indexed neighboursIn is checked against, and PitchShifter.latency is the test's one view of how late the shifter is. Comments and docs: - Seven comments told history ("no longer", "any more", "as before", "of before #354"). Nine comment blocks ran far past the line width. Proof that this changed no code: the bundle was md5 identical, and the touched tests and e2e modules were identical after esbuild. - README: sound FX, instrument, pattern, song and bus in the asset list, the pages Instruments, Patterns and Songs, 1919 checks. - Wiki: see its own commit. Tests: Gate (melektaus-atx) 274 files, 4236 tests, CHECK EXIT 0 e2e 34, 64, 65 ALL PASSED, 180 checks Unit, touched areas 16 files, 804 tests No check was added, the e2e sum stays at 1919. Counter-checks, each put back by copy and compared with cmp: - addLink without the loop rule: 2 tests fail, one per routing. - eqCurves with the sum of the last band only: 1 test fails. - Start in the worklet never waiting: e2e 34 fails in exactly the four checks that hang on a voice's first sample (Flanger, Tremolo, Chip, a pitched note planned ahead). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
127 lines
4.5 KiB
TypeScript
127 lines
4.5 KiB
TypeScript
import { isStruct } from '../../../model/Properties';
|
||
import { DEFAULT_TEMPO, heldTempo, MAX_TEMPO, MIN_TEMPO } from '../../../music/time';
|
||
import type { FxParams } from '../../../soundfx/nodes';
|
||
import type { NodeDef, PortDef } from '../../NodeRegistry';
|
||
import { asBoolean, asNumber, asString, type Value } from '../../values';
|
||
import {
|
||
detachedPort,
|
||
exec,
|
||
fxParamsPort,
|
||
num,
|
||
playedBusPort,
|
||
soundFxPort,
|
||
soundPort,
|
||
withDefault,
|
||
} from '../shared';
|
||
|
||
/**
|
||
* Three answers, not two: a checkbox cannot say "leave it to the asset", and without that a sound
|
||
* whose own `Loop` is on could never be played as a one-shot.
|
||
*/
|
||
const LOOP_OPTIONS = [
|
||
{ value: '', label: 'From the asset' },
|
||
{ value: 'true', label: 'On' },
|
||
{ value: 'false', label: 'Off' },
|
||
];
|
||
|
||
/** `any`, not `boolean`, so a graph can still drive the choice – see `loopChoice`. */
|
||
const loopPort = (): PortDef => ({
|
||
key: 'loop',
|
||
label: 'loop',
|
||
type: 'any',
|
||
default: '',
|
||
field: { key: 'loop', label: 'Loop', kind: 'enum', default: '', options: LOOP_OPTIONS },
|
||
});
|
||
|
||
/**
|
||
* What the node says about looping: nothing (the asset decides) or an answer that overrules it.
|
||
* A boolean arriving over an edge is taken literally, which is what wiring a comparison or a
|
||
* variable into this input is for.
|
||
*/
|
||
function loopChoice(value: Value | undefined): boolean | undefined {
|
||
if (typeof value === 'boolean') return value;
|
||
const text = asString(value);
|
||
if (text === 'true') return true;
|
||
if (text === 'false') return false;
|
||
return undefined;
|
||
}
|
||
|
||
export const PlaySound: NodeDef = {
|
||
type: 'PlaySound',
|
||
label: 'Play sound',
|
||
category: 'action',
|
||
description:
|
||
'Plays a sound asset. "volume" multiplies the volume the asset itself carries and "loop" either ' +
|
||
"leaves the asset's own setting alone or overrules it, so the asset says what the sound is and " +
|
||
'the node only colors it. Each play is a voice of its own: firing this twice in a row is heard ' +
|
||
'twice, overlapping. The sound belongs to this object and stops when the object is destroyed, ' +
|
||
'unless "detached" is on. "fx" sends it through a sound FX asset instead of the one the sound ' +
|
||
'names; left empty, it takes that one, and None plays it as it is. ' +
|
||
'"fx params" takes values for its parameters from a Sound FX parameters node. "voice" is the ' +
|
||
'number of this one play, for Set sound FX parameters to change it while it plays; 0 where ' +
|
||
'nothing was played. "length" is how many seconds one run of the sound lasts, to hand to the ' +
|
||
'"time" of Set sound FX parameters so a change spans the sound; 0 where nothing was played or ' +
|
||
'the sound has not been loaded yet. A pitch never changes it. "tail" is that length and the ' +
|
||
'echoes of its FX after it, as they are when it starts – how long until the voice is quiet. ' +
|
||
'"tempo" is what a Delay of its FX synced to beats counts by, in quarter notes a minute. "bus" is ' +
|
||
'the bus it is heard on; left empty, the one the sound names.',
|
||
inputs: [
|
||
exec(),
|
||
soundPort(),
|
||
withDefault(num('volume'), 1),
|
||
loopPort(),
|
||
detachedPort(),
|
||
soundFxPort(),
|
||
fxParamsPort(),
|
||
tempoPort(),
|
||
playedBusPort(),
|
||
],
|
||
outputs: [exec(), num('voice'), num('length'), num('tail')],
|
||
params: [],
|
||
run: (ctx, inputs) => {
|
||
const sound = asString(inputs.sound);
|
||
const voice = sound
|
||
? ctx.playSound(
|
||
sound,
|
||
asNumber(inputs.volume),
|
||
loopChoice(inputs.loop),
|
||
asBoolean(inputs.detached),
|
||
asString(inputs.fx),
|
||
fxParamsOf(inputs.fxParams),
|
||
heldTempo(asNumber(inputs.tempo)),
|
||
asString(inputs.bus),
|
||
)
|
||
: 0;
|
||
const length = voice ? ctx.soundLength(sound) : 0;
|
||
const tail = length > 0 ? length + ctx.soundTail(voice) : 0;
|
||
return { next: 'exec', outputs: { voice, length, tail } };
|
||
},
|
||
};
|
||
|
||
/** The tempo of a voice outside a song (#332), for a Delay synced to beats. */
|
||
export function tempoPort(): PortDef {
|
||
return {
|
||
key: 'tempo',
|
||
label: 'tempo',
|
||
type: 'number',
|
||
default: DEFAULT_TEMPO,
|
||
field: {
|
||
key: 'tempo',
|
||
label: 'Tempo (BPM)',
|
||
kind: 'number',
|
||
default: DEFAULT_TEMPO,
|
||
min: MIN_TEMPO,
|
||
max: MAX_TEMPO,
|
||
step: 1,
|
||
},
|
||
};
|
||
}
|
||
|
||
/** The numbers of a parameter bundle; anything else hands in none. */
|
||
export function fxParamsOf(value: Value | undefined): FxParams {
|
||
if (!isStruct(value)) return {};
|
||
const params: Record<string, number> = {};
|
||
for (const [key, item] of Object.entries(value)) if (typeof item === 'number') params[key] = item;
|
||
return params;
|
||
}
|