Skip to content

Write HTML. Render video. Built for agents.

fix(studio): a saved clip volume reaches the timeline store (#4883)

Miguel Ángel30ed3cd1242d
diff --git a/packages/studio/src/player/lib/automationStoreSync.test.ts b/packages/studio/src/player/lib/automationStoreSync.test.ts
index 7a7b86e895..d8c8ea94e1 100644
--- a/packages/studio/src/player/lib/automationStoreSync.test.ts
+++ b/packages/studio/src/player/lib/automationStoreSync.test.ts
@@ -40,9 +40,24 @@ describe("syncStoredElementAttribute", () => {
syncStoredElementAttribute(el(), "data-fade-in", null);
expect(usePlayerStore.getState().elements[0]?.fadeIn).toBeUndefined();
});
+
+ // A quick volume save left the clip at its last load's volume, so a card reopened on it read the old level.
+ it("records a saved volume, and drops it when the attribute goes", () => {
+ usePlayerStore.setState({ elements: [el({ volume: 0.5 })] });
+ syncStoredElementAttribute(el(), "data-volume", "1.5");
+ expect(usePlayerStore.getState().elements[0]?.volume).toBe(1.5);
+ syncStoredElementAttribute(el(), "data-volume", null);
+ expect(usePlayerStore.getState().elements[0]?.volume).toBeUndefined();
+ });
});
describe("syncStoredAutomationFromPreview", () => {
+ it("reads back a volume an undo restored on the preview", () => {
+ usePlayerStore.setState({ elements: [el({ volume: 1.5 })] });
+ syncStoredAutomationFromPreview(previewWith({ "data-volume": "0.5" }));
+ expect(usePlayerStore.getState().elements[0]?.volume).toBe(0.5);
+ });
+
it("reads back a fade an undo restored on the preview", () => {
usePlayerStore.setState({ elements: [el({ fadeOut: 2 })] });
syncStoredAutomationFromPreview(previewWith({ "data-fade-in": "0.6" }));
diff --git a/packages/studio/src/player/lib/automationStoreSync.ts b/packages/studio/src/player/lib/automationStoreSync.ts
index 3e2fe59732..0d926e4adb 100644
--- a/packages/studio/src/player/lib/automationStoreSync.ts
+++ b/packages/studio/src/player/lib/automationStoreSync.ts
@@ -24,10 +24,15 @@ import {
} from "@hyperframes/core/audio-fade";
import { usePlayerStore, type TimelineElement } from "../store/playerStore";
import { groupInfoFor } from "./timelineGroupInfo";
-import { getTimelineElementIdentity, previewElementFinder } from "./timelineElementHelpers";
+import {
+ getTimelineElementIdentity,
+ previewElementFinder,
+ resolveMediaElement,
+} from "./timelineElementHelpers";
+import { elementVolume, parseStoredVolume } from "./storedVolume";
/**
- * Re-read every element's automation, FX-chain and fade attributes from the preview
+ * Re-read every element's automation, FX-chain, fade and volume attributes from the preview
* document, for a change that reached the DOM without going through this store.
*
* That is undo and redo. A soft restore patches the reverted attributes onto the
@@ -40,9 +45,9 @@ import { getTimelineElementIdentity, previewElementFinder } from "./timelineElem
* reverted is only known by looking.
*/
/**
- * What an element's six synced fields SHOULD read, given the preview.
+ * What an element's seven synced fields SHOULD read, given the preview.
*
- * Its own four come off its node; the other two are its copy of what its group
+ * Its own five come off its node; the other two are its copy of what its group
* carries. The timeline derives a group's lanes and chain from these mirrors,
* never from the group element, and automating a group writes `data-automation`
* on the group node through the ordinary element path, so both halves are re-read.
@@ -55,6 +60,7 @@ function syncedFields(doc: Document, element: TimelineElement, node: Element) {
fxChain: node.getAttribute(HF_AUDIO_FX_ATTR) ?? undefined,
fadeIn: storedFade(fades.fadeIn),
fadeOut: storedFade(fades.fadeOut),
+ volume: elementVolume(node, resolveMediaElement(node) ?? node),
audioGroupAutomation: group?.automation,
audioGroupFxChain: group?.fxChain,
};
@@ -88,9 +94,11 @@ const STORED_FIELD: Record<string, (value: string | null) => Partial<TimelineEle
[HF_AUDIO_FX_ATTR]: (value) => ({ fxChain: value ?? undefined }),
[HF_AUDIO_FADE_IN_ATTR]: (value) => ({ fadeIn: storedFade(readFadeSeconds(value)) }),
[HF_AUDIO_FADE_OUT_ATTR]: (value) => ({ fadeOut: storedFade(readFadeSeconds(value)) }),
+ // A quick volume save writes no other field the store keeps: without this, a clip read its last load's volume.
+ "data-volume": (value) => ({ volume: parseStoredVolume(value) }),
};
-/** Record a saved automation, FX-chain or fade value on one element's stored copy. */
+/** Record a saved automation, FX-chain, fade or volume value on one element's stored copy. */
export function syncStoredElementAttribute(
target: TimelineElement,
attr: string,
diff --git a/packages/studio/src/player/lib/storedVolume.ts b/packages/studio/src/player/lib/storedVolume.ts
new file mode 100644
index 0000000000..c167b424a2
--- /dev/null
+++ b/packages/studio/src/player/lib/storedVolume.ts
@@ -0,0 +1,7 @@
+export function parseStoredVolume(text: string | null): number | undefined {
+ const volume = Number.parseFloat(text ?? "");
+ return Number.isFinite(volume) ? volume : undefined;
+}
+
+export const elementVolume = (el: Element, media: Element) =>
+ parseStoredVolume(el.getAttribute("data-volume") ?? media.getAttribute("data-volume"));
diff --git a/packages/studio/src/player/lib/timelineElementHelpers.ts b/packages/studio/src/player/lib/timelineElementHelpers.ts
index 2b2c13d945..dd1ca26583 100644
--- a/packages/studio/src/player/lib/timelineElementHelpers.ts
+++ b/packages/studio/src/player/lib/timelineElementHelpers.ts
@@ -13,6 +13,7 @@ import { isFinitePositive } from "./playbackAdapter";
import { getSourceScopedSelectorIndex } from "../../utils/sourceScopedSelectorIndex";
import { HF_AUDIO_GROUP_TAG } from "@hyperframes/core/audio-groups";
import { readElementFades } from "@hyperframes/core/audio-fade";
+import { elementVolume } from "./storedVolume";
import {
type AttrReader,
clampPlaybackRate,
@@ -213,13 +214,6 @@ function setOptional<K extends keyof TimelineElement>(
else entry[key] = value;
}
-function readVolume(el: Element, media: Element): number | undefined {
- const volume = Number.parseFloat(
- el.getAttribute("data-volume") ?? media.getAttribute("data-volume") ?? "",
- );
- return Number.isFinite(volume) ? volume : undefined;
-}
-
/** The compiler's rule (timingCompiler): explicit data-has-audio wins; otherwise an unmuted <video> is audible. */
export function isVideoAudible(opts: {
tag: string;
@@ -251,7 +245,7 @@ function applyAudioMetadataFromElement(entry: TimelineElement, el: Element): voi
});
setOptional(entry, "hasAudio", sound ? true : undefined);
setOptional(entry, "muted", muted ? true : undefined);
- setOptional(entry, "volume", readVolume(el, media));
+ setOptional(entry, "volume", elementVolume(el, media));
}
function applyFadeMetadataFromElement(entry: TimelineElement, el: Element): void {