Skip to content

The open-source CapCut alternative

Merge branch 'main' into feature/optimize-timeline-ruler

gantiro955f6331f258
diff --cc apps/web/src/components/editor/timeline.tsx
index c6e6a331,539846b3..bfb663c6
--- a/apps/web/src/components/editor/timeline.tsx
+++ b/apps/web/src/components/editor/timeline.tsx
@@@ -55,10 -53,8 +55,11 @@@ import
getCumulativeHeightBefore,
getTotalTracksHeight,
TIMELINE_CONSTANTS,
+ snapTimeToFrame,
} from "@/constants/timeline-constants";
+import { Slider } from "../ui/slider";
+import TimelineCanvasRuler from "./timeline-canvas/timeline-canvas-ruler";
+import TimelineCanvasRulerWrapper from "./timeline-canvas/timeline-canvas-ruler-wrapper";
export function Timeline() {
// Timeline shows all tracks (video, audio, effects) and their elements.