Skip to content

Commit fc14441

Browse files
committed
fix(core): tap meters on the program bus, mute on a monitor gain
1 parent a073572 commit fc14441

2 files changed

Lines changed: 44 additions & 11 deletions

File tree

‎packages/core/src/runtime/webAudioTransport.test.ts‎

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ function createMockAudioContext(currentTime = 100) {
3131
gain: { value: 1 },
3232
connect: vi.fn(),
3333
};
34+
const monitorGain = {
35+
gain: { value: 1 },
36+
connect: vi.fn(),
37+
};
3438
const ctx = {
3539
currentTime,
3640
state: "running",
@@ -41,14 +45,15 @@ function createMockAudioContext(currentTime = 100) {
4145
destination: {},
4246
close: vi.fn(),
4347
};
44-
return { ctx, sourceNode, mediaElementSourceNode, gainNode, masterGain, startFn };
48+
return { ctx, sourceNode, mediaElementSourceNode, gainNode, masterGain, monitorGain, startFn };
4549
}
4650

4751
function setupTransport(currentTime = 100) {
4852
const transport = new WebAudioTransport();
4953
const mock = createMockAudioContext(currentTime);
5054
(transport as unknown as { _ctx: unknown })._ctx = mock.ctx;
5155
(transport as unknown as { _masterGain: unknown })._masterGain = mock.masterGain;
56+
(transport as unknown as { _monitorGain: unknown })._monitorGain = mock.monitorGain;
5257
const gen = transport.startGeneration();
5358
return { transport, mock, gen };
5459
}
@@ -87,12 +92,12 @@ describe("WebAudioTransport author gain vs user volume", () => {
8792

8893
it("keeps the user's master volume spec-clamped — it is a fader, not a gain", () => {
8994
const transport = new WebAudioTransport();
90-
const master = { gain: { value: 1 }, connect: vi.fn() };
91-
(transport as unknown as { _masterGain: unknown })._masterGain = master;
95+
const monitor = { gain: { value: 1 }, connect: vi.fn() };
96+
(transport as unknown as { _monitorGain: unknown })._monitorGain = monitor;
9297

9398
transport.setVolume(99);
9499

95-
expect(master.gain.value).toBe(1);
100+
expect(monitor.gain.value).toBe(1);
96101
});
97102
});
98103

@@ -341,11 +346,13 @@ describe("WebAudioTransport", () => {
341346
const { transport, mock } = setupTransport();
342347
transport.setVolume(0.4);
343348
transport.setMuted(true);
344-
expect(mock.masterGain.gain.value).toBe(0);
349+
expect(mock.monitorGain.gain.value).toBe(0);
350+
expect(mock.masterGain.gain.value).toBe(1);
345351

346352
transport.setMuted(false);
347353

348-
expect(mock.masterGain.gain.value).toBe(0.4);
354+
expect(mock.monitorGain.gain.value).toBe(0.4);
355+
expect(mock.masterGain.gain.value).toBe(1);
349356
});
350357

351358
it("applies author and user volume once in separate gain layers", async () => {
@@ -354,8 +361,11 @@ describe("WebAudioTransport", () => {
354361
transport.setVolume(0.5);
355362

356363
expect(mock.gainNode.gain.value).toBe(0.8);
357-
expect(mock.masterGain.gain.value).toBe(0.5);
358-
expect(mock.gainNode.gain.value * mock.masterGain.gain.value).toBeCloseTo(0.4);
364+
expect(mock.masterGain.gain.value).toBe(1);
365+
expect(mock.monitorGain.gain.value).toBe(0.5);
366+
expect(
367+
mock.gainNode.gain.value * mock.masterGain.gain.value * mock.monitorGain.gain.value,
368+
).toBeCloseTo(0.4);
359369
});
360370

361371
describe("ownsElement (per-element mute gate)", () => {
@@ -738,6 +748,7 @@ describe("WebAudioTransport", () => {
738748
getFloatTimeDomainData: ReturnType<typeof vi.fn>;
739749
}[] = [];
740750
const masterGain = { gain: { value: 1 }, connect: vi.fn(), disconnect: vi.fn() };
751+
const monitorGain = { gain: { value: 1 }, connect: vi.fn(), disconnect: vi.fn() };
741752
const mediaElementSource = { connect: vi.fn(), disconnect: vi.fn() };
742753
const ctx = {
743754
currentTime,
@@ -792,14 +803,15 @@ describe("WebAudioTransport", () => {
792803
destination: {},
793804
close: vi.fn(),
794805
};
795-
return { ctx, gainNodes, analysers, masterGain, mediaElementSource };
806+
return { ctx, gainNodes, analysers, masterGain, monitorGain, mediaElementSource };
796807
}
797808

798809
function setupGroupTransport(currentTime = 100) {
799810
const transport = new WebAudioTransport();
800811
const mock = createGroupMockAudioContext(currentTime);
801812
(transport as unknown as { _ctx: unknown })._ctx = mock.ctx;
802813
(transport as unknown as { _masterGain: unknown })._masterGain = mock.masterGain;
814+
(transport as unknown as { _monitorGain: unknown })._monitorGain = mock.monitorGain;
803815
const gen = transport.startGeneration();
804816
return { transport, mock, gen };
805817
}
@@ -1144,6 +1156,22 @@ describe("WebAudioTransport", () => {
11441156
expect(groupOutput.connect).toHaveBeenCalledTimes(connectsBefore + 1);
11451157
expect(groupOutput.connect).toHaveBeenCalledWith(mock.masterGain);
11461158
expect(mock.masterGain.connect).toHaveBeenCalledTimes(1);
1159+
expect(mock.monitorGain.connect).not.toHaveBeenCalled();
1160+
});
1161+
1162+
it("keeps program taps off the monitor fader", async () => {
1163+
addGroup("vo");
1164+
const { transport, mock, gen } = setupGroupTransport();
1165+
await scheduleGrouped(transport, gen, "a", "vo");
1166+
transport.startMetering();
1167+
transport.setVolume(0.5);
1168+
transport.setMuted(true);
1169+
const groupOutput = mock.gainNodes.find((n) =>
1170+
n.connect.mock.calls.some((call) => call[0] === mock.masterGain),
1171+
);
1172+
expect(mock.masterGain.gain.value).toBe(1);
1173+
expect(groupOutput?.gain.value).toBe(1);
1174+
expect(mock.monitorGain.gain.value).toBe(0);
11471175
});
11481176

11491177
it("reads the peak per channel and stops cleanly", async () => {

‎packages/core/src/runtime/webAudioTransport.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ export class WebAudioTransport {
141141
private _mediaElementSources = new WeakMap<HTMLMediaElement, MediaElementAudioSourceNode>();
142142
private _activeSources: ScheduledSource[] = [];
143143
private _masterGain: GainNode | null = null;
144+
/** Preview volume and mute. Downstream of `_masterGain`; meters tap the program. */
145+
private _monitorGain: GainNode | null = null;
144146
private _masterVolume = 1;
145147
private _masterMuted = false;
146148
// One shared bus per group id, lazily built the first time a member of that
@@ -184,7 +186,9 @@ export class WebAudioTransport {
184186
try {
185187
this._ctx = new AudioContext();
186188
this._masterGain = this._ctx.createGain();
187-
this._masterGain.connect(this._ctx.destination);
189+
this._monitorGain = this._ctx.createGain();
190+
this._masterGain.connect(this._monitorGain);
191+
this._monitorGain.connect(this._ctx.destination);
188192
this.applyMasterGain();
189193
if (this._metering) this.attachMasterTap();
190194
return true;
@@ -807,7 +811,7 @@ export class WebAudioTransport {
807811
}
808812

809813
private applyMasterGain(): void {
810-
if (this._masterGain) this._masterGain.gain.value = this._masterMuted ? 0 : this._masterVolume;
814+
if (this._monitorGain) this._monitorGain.gain.value = this._masterMuted ? 0 : this._masterVolume;
811815
}
812816

813817
isActive(): boolean {
@@ -842,6 +846,7 @@ export class WebAudioTransport {
842846
}
843847
this._ctx = null;
844848
this._masterGain = null;
849+
this._monitorGain = null;
845850
this._masterVolume = 1;
846851
this._masterMuted = false;
847852
}

0 commit comments

Comments
 (0)