refactor: structured track layout per scene

2 files changed, 13 insertions, 10 deletions

diff --git a/apps/web/src/lib/media/audio.ts b/apps/web/src/lib/media/audio.ts
index 2fbea32e..a70a6fa1 100644
--- a/apps/web/src/lib/media/audio.ts
+++ b/apps/web/src/lib/media/audio.ts
@@ -2,7 +2,7 @@ import type {
 	AudioElement,
 	LibraryAudioElement,
 	RetimeConfig,
-	TimelineTrack,
+	SceneTracks,
 } from "@/lib/timeline";
 import { shouldMaintainPitch } from "@/lib/retime/rate";
 import type { MediaAsset } from "@/lib/media/types";
@@ -89,16 +89,17 @@ export async function collectAudioElements({
 	mediaAssets,
 	audioContext,
 }: {
-	tracks: TimelineTrack[];
+	tracks: SceneTracks;
 	mediaAssets: MediaAsset[];
 	audioContext: AudioContext;
 }): Promise<CollectedAudioElement[]> {
+	const orderedTracks = [...tracks.overlay, tracks.main, ...tracks.audio];
 	const mediaMap = new Map<string, MediaAsset>(
 		mediaAssets.map((media) => [media.id, media]),
 	);
 	const pendingElements: Array<Promise<CollectedAudioElement | null>> = [];
 
-	for (const track of tracks) {
+	for (const track of orderedTracks) {
 		if (canTrackHaveAudio(track) && track.muted) continue;
 
 		for (const element of track.elements) {
@@ -445,16 +446,17 @@ export async function collectAudioMixSources({
 	tracks,
 	mediaAssets,
 }: {
-	tracks: TimelineTrack[];
+	tracks: SceneTracks;
 	mediaAssets: MediaAsset[];
 }): Promise<AudioMixSource[]> {
+	const orderedTracks = [...tracks.overlay, tracks.main, ...tracks.audio];
 	const audioMixSources: AudioMixSource[] = [];
 	const mediaMap = new Map<string, MediaAsset>(
 		mediaAssets.map((asset) => [asset.id, asset]),
 	);
 	const pendingLibrarySources: Array<Promise<AudioMixSource | null>> = [];
 
-	for (const track of tracks) {
+	for (const track of orderedTracks) {
 		if (canTrackHaveAudio(track) && track.muted) continue;
 
 		for (const element of track.elements) {
@@ -507,16 +509,17 @@ export async function collectAudioClips({
 	tracks,
 	mediaAssets,
 }: {
-	tracks: TimelineTrack[];
+	tracks: SceneTracks;
 	mediaAssets: MediaAsset[];
 }): Promise<AudioClipSource[]> {
+	const orderedTracks = [...tracks.overlay, tracks.main, ...tracks.audio];
 	const clips: AudioClipSource[] = [];
 	const mediaMap = new Map<string, MediaAsset>(
 		mediaAssets.map((asset) => [asset.id, asset]),
 	);
 	const pendingLibraryClips: Array<Promise<AudioClipSource | null>> = [];
 
-	for (const track of tracks) {
+	for (const track of orderedTracks) {
 		const isTrackMuted = canTrackHaveAudio(track) && track.muted;
 
 		for (const element of track.elements) {
@@ -587,7 +590,7 @@ export async function createTimelineAudioBuffer({
 	sampleRate = EXPORT_SAMPLE_RATE,
 	audioContext,
 }: {
-	tracks: TimelineTrack[];
+	tracks: SceneTracks;
 	mediaAssets: MediaAsset[];
 	duration: number;
 	sampleRate?: number;
diff --git a/apps/web/src/lib/media/mediabunny.ts b/apps/web/src/lib/media/mediabunny.ts
index dbb6ecad..a313c6f0 100644
--- a/apps/web/src/lib/media/mediabunny.ts
+++ b/apps/web/src/lib/media/mediabunny.ts
@@ -1,6 +1,6 @@
 import { Input, ALL_FORMATS, BlobSource } from "mediabunny";

 import { createTimelineAudioBuffer } from "@/lib/media/audio";

-import type { TimelineTrack } from "@/lib/timeline";

+import type { SceneTracks } from "@/lib/timeline";

 import type { MediaAsset } from "@/lib/media/types";

 

 export async function getVideoInfo({

@@ -48,7 +48,7 @@ export const extractTimelineAudio = async ({
 	totalDuration,

 	onProgress,

 }: {

-	tracks: TimelineTrack[];

+	tracks: SceneTracks;

 	mediaAssets: MediaAsset[];

 	totalDuration: number;

 	onProgress?: (progress: number) => void;