Skip to content

Commit 07965e9

Browse files
fix(studio): play preview audio at speeds above 1x (#2691)
* fix(studio): play preview audio at speeds above 1x The player force-muted preview audio whenever playback rate exceeded 1x and disabled the mute button (and the M shortcut) in that state. Users changing speed to 2x heard nothing, and clicking unmute did nothing. Media elements play audio fine at any rate (pitch preserved by default), so remove the special case: audio now follows only the user's mute toggle at every speed. Drops the shouldMutePreviewAudio helper and the audioAutoMuted UI/keyboard gating that existed solely for it. * test(studio): update seek audio test for unmuted-above-1x behavior useTimelinePlayer.seek.test.ts still asserted the old force-mute: at 2x with the user unmuted it expected a set-muted{muted:true} message. With audio now following only the user's toggle, the preview receives set-muted{muted:false}. Update the assertion and title to match.
1 parent 8532564 commit 07965e9

8 files changed

Lines changed: 18 additions & 66 deletions

File tree

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { describe, expect, it } from "vitest";
22
import { resolveSeekPercent } from "./PlayerControls";
3-
import { shouldMutePreviewAudio } from "../lib/timelineIframeHelpers";
43

54
describe("resolveSeekPercent", () => {
65
it("returns 0 when the track width is invalid", () => {
@@ -19,19 +18,3 @@ describe("resolveSeekPercent", () => {
1918
expect(resolveSeekPercent(150, 100, 200)).toBe(0.25);
2019
});
2120
});
22-
23-
describe("shouldMutePreviewAudio", () => {
24-
it("mutes when the user toggled audio off", () => {
25-
expect(shouldMutePreviewAudio(true, 1)).toBe(true);
26-
});
27-
28-
it("auto-mutes above 1x playback", () => {
29-
expect(shouldMutePreviewAudio(false, 1.5)).toBe(true);
30-
expect(shouldMutePreviewAudio(false, 2)).toBe(true);
31-
});
32-
33-
it("keeps audio on at 1x or slower when the user has not muted it", () => {
34-
expect(shouldMutePreviewAudio(false, 1)).toBe(false);
35-
expect(shouldMutePreviewAudio(false, 0.5)).toBe(false);
36-
});
37-
});

‎packages/studio/src/player/components/PlayerControls.tsx‎

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { useRef, useCallback, useEffect, memo } from "react";
22
import gsap from "gsap";
33
import { MorphSVGPlugin } from "gsap/MorphSVGPlugin";
44
import { formatFrameTime, formatTime, stepFrameTime } from "../lib/time";
5-
import { shouldMutePreviewAudio } from "../lib/timelineIframeHelpers";
65
import { usePlayerStore } from "../store/playerStore";
76
import { trackStudioEvent } from "../../utils/studioTelemetry";
87
import { Tooltip } from "../../components/ui";
@@ -60,40 +59,30 @@ function PlayPauseMorphIcon({ playing }: { playing: boolean }) {
6059

6160
const MuteButton = memo(function MuteButton({
6261
audioMuted,
63-
audioAutoMuted,
64-
effectiveAudioMuted,
6562
controlsDisabled,
6663
setAudioMuted,
6764
}: {
6865
audioMuted: boolean;
69-
audioAutoMuted: boolean;
70-
effectiveAudioMuted: boolean;
7166
controlsDisabled: boolean;
7267
setAudioMuted: (v: boolean) => void;
7368
}) {
74-
const label = audioAutoMuted
75-
? "Audio muted above 1x speed"
76-
: audioMuted
77-
? "Unmute audio"
78-
: "Mute audio";
69+
const label = audioMuted ? "Unmute audio" : "Mute audio";
7970
return (
8071
<Tooltip label={label}>
8172
<button
8273
type="button"
8374
onClick={() => {
84-
if (!audioAutoMuted) {
85-
trackStudioEvent("playback", { action: "mute_toggle", muted: !audioMuted });
86-
setAudioMuted(!audioMuted);
87-
}
75+
trackStudioEvent("playback", { action: "mute_toggle", muted: !audioMuted });
76+
setAudioMuted(!audioMuted);
8877
}}
89-
disabled={controlsDisabled || audioAutoMuted}
78+
disabled={controlsDisabled}
9079
aria-label={label}
91-
aria-pressed={effectiveAudioMuted}
80+
aria-pressed={audioMuted}
9281
className={`h-7 w-7 flex-shrink-0 flex items-center justify-center rounded-md border transition-colors disabled:pointer-events-none ${
93-
effectiveAudioMuted
82+
audioMuted
9483
? "text-studio-accent bg-studio-accent/10 border-studio-accent/30"
9584
: "border-neutral-700 text-neutral-400 hover:border-neutral-500 hover:bg-neutral-800"
96-
} ${audioAutoMuted ? "opacity-70" : ""}`}
85+
}`}
9786
>
9887
<svg
9988
width="13"
@@ -107,7 +96,7 @@ const MuteButton = memo(function MuteButton({
10796
aria-hidden="true"
10897
>
10998
<path d="M11 5 6 9H3v6h3l5 4V5Z" />
110-
{effectiveAudioMuted ? (
99+
{audioMuted ? (
111100
<>
112101
<path d="m19 9-6 6" />
113102
<path d="m13 9 6 6" />
@@ -383,8 +372,6 @@ export const PlayerControls = memo(function PlayerControls({
383372
const durationRef = useRef(duration);
384373
durationRef.current = duration;
385374
const controlsDisabled = disabled || !timelineReady;
386-
const audioAutoMuted = playbackRate > 1;
387-
const effectiveAudioMuted = shouldMutePreviewAudio(audioMuted, playbackRate);
388375

389376
useEffect(() => {
390377
if (!timeDisplayRef.current) return;
@@ -486,8 +473,6 @@ export const PlayerControls = memo(function PlayerControls({
486473

487474
<MuteButton
488475
audioMuted={audioMuted}
489-
audioAutoMuted={audioAutoMuted}
490-
effectiveAudioMuted={effectiveAudioMuted}
491476
controlsDisabled={controlsDisabled}
492477
setAudioMuted={setAudioMuted}
493478
/>

‎packages/studio/src/player/hooks/usePlaybackKeyboard.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ describe("usePlaybackKeyboard — mute & loop shortcuts (#905)", () => {
189189
expect(usePlayerStore.getState().audioMuted).toBe(false);
190190
});
191191

192-
it("M does NOT toggle audioMuted above 1x playback (matches button gating)", () => {
192+
it("M toggles audioMuted above 1x playback too", () => {
193193
const { dispatch } = setupHook();
194194
usePlayerStore.setState({ playbackRate: 2, audioMuted: false });
195195

196196
act(() => {
197197
dispatch(keydown({ code: "KeyM", key: "m" }));
198198
});
199199

200-
expect(usePlayerStore.getState().audioMuted).toBe(false);
200+
expect(usePlayerStore.getState().audioMuted).toBe(true);
201201
});
202202

203203
it("Shift+L toggles loopEnabled without starting forward shuttle", () => {

‎packages/studio/src/player/hooks/usePlaybackKeyboard.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,7 @@ export function usePlaybackKeyboard({
116116
if (key === "m") {
117117
e.preventDefault();
118118
const state = usePlayerStore.getState();
119-
// Audio is force-muted above 1x playback — match the mute button's gating.
120-
if (state.playbackRate <= 1) {
121-
state.setAudioMuted(!state.audioMuted);
122-
}
119+
state.setAudioMuted(!state.audioMuted);
123120
return;
124121
}
125122
if (key === "l" && e.shiftKey) {

‎packages/studio/src/player/hooks/useTimelinePlayer.seek.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ describe("useTimelinePlayer seek hydration", () => {
211211
});
212212

213213
describe("useTimelinePlayer audio controls (#835)", () => {
214-
it("applies playback-rate changes immediately and auto-mutes audio above 1x", () => {
214+
it("applies playback-rate changes immediately and keeps audio unmuted above 1x", () => {
215215
const { api, root } = renderTimelinePlayerHarness();
216216
const postMessage = vi.fn();
217217
const timeScale = vi.fn();
@@ -244,7 +244,7 @@ describe("useTimelinePlayer audio controls (#835)", () => {
244244
source: "hf-parent",
245245
type: "control",
246246
action: "set-muted",
247-
muted: true,
247+
muted: false,
248248
}),
249249
"*",
250250
);

‎packages/studio/src/player/hooks/useTimelinePlayer.ts‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ import {
3737
parseTimelineFromDOM,
3838
} from "../lib/timelineDOM";
3939
import { normalizeToZones } from "../components/timelineZones";
40-
import {
41-
setPreviewMediaMuted,
42-
setPreviewPlaybackRate,
43-
shouldMutePreviewAudio,
44-
} from "../lib/timelineIframeHelpers";
40+
import { setPreviewMediaMuted, setPreviewPlaybackRate } from "../lib/timelineIframeHelpers";
4541
import { scrubMusicAtSeek, stopScrubPreviewAudio } from "../lib/playbackScrub";
4642
import { applyCachedSourceDurations, probeMissingSourceDurations } from "../lib/mediaProbe";
4743
import { shouldResumeForwardPlaybackAfterSeek, shouldStopAfterSeek } from "../lib/playbackSeek";
@@ -241,13 +237,9 @@ export function useTimelinePlayer() {
241237
}
242238
} catch {}
243239
}, []);
244-
const applyPreviewAudioState = useCallback((playbackRateOverride?: number) => {
245-
const { audioMuted, playbackRate } = usePlayerStore.getState();
246-
const effectivePlaybackRate = playbackRateOverride ?? playbackRate;
247-
setPreviewMediaMuted(
248-
iframeRef.current,
249-
shouldMutePreviewAudio(audioMuted, effectivePlaybackRate),
250-
);
240+
const applyPreviewAudioState = useCallback(() => {
241+
const { audioMuted } = usePlayerStore.getState();
242+
setPreviewMediaMuted(iframeRef.current, audioMuted);
251243
}, []);
252244
const play = useCallback(() => {
253245
stopRAFLoop();
@@ -285,7 +277,7 @@ export function useTimelinePlayer() {
285277
if (initialTime !== adapter.getTime()) adapter.seek(initialTime);
286278
const speed = Math.max(0.1, Math.min(4, rate));
287279
applyPlaybackRate(speed);
288-
applyPreviewAudioState(speed);
280+
applyPreviewAudioState();
289281
let startTime = initialTime;
290282
let startedAt = performance.now();
291283

‎packages/studio/src/player/lib/timelineDOM.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ export {
5555
autoHealMissingCompositionIds,
5656
setPreviewMediaMuted,
5757
setPreviewPlaybackRate,
58-
shouldMutePreviewAudio,
5958
resolveIframe,
6059
buildMissingCompositionElements,
6160
} from "./timelineIframeHelpers";

‎packages/studio/src/player/lib/timelineIframeHelpers.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ function postPreviewControl(
111111
postRuntimeControlMessage(iframe.contentWindow, action, payload);
112112
}
113113

114-
export function shouldMutePreviewAudio(audioMuted: boolean, playbackRate: number): boolean {
115-
return audioMuted || playbackRate > 1;
116-
}
117-
118114
export function setPreviewMediaMuted(iframe: HTMLIFrameElement | null, muted: boolean): void {
119115
if (!iframe) return;
120116
try {

0 commit comments

Comments
 (0)