Skip to content

The open-source CapCut alternative

fix: merge conflicts, merge

Hyteq65bff0d2da7c
diff --cc apps/web/src/components/ui/video-player.tsx
index f489f70a,fdc2ed02..32a12916
--- a/apps/web/src/components/ui/video-player.tsx
+++ b/apps/web/src/components/ui/video-player.tsx
@@@ -29,23 -31,30 +29,25 @@@ export function VideoPlayer(
const clipEndTime = clipStartTime + (clipDuration - trimStart - trimEnd);
const isInClipRange = currentTime >= clipStartTime && currentTime < clipEndTime;
- // Calculate the video's internal time based on timeline position
- const videoTime = Math.max(trimStart, Math.min(
- clipDuration - trimEnd,
- currentTime - clipStartTime + trimStart
- ));
-
+ // Sync playback events
useEffect(() => {
const video = videoRef.current;
- if (!video) return;
+ if (!video || !isInClipRange) return;
- const handleSeek = (e: CustomEvent) => {
+ const handleSeekEvent = (e: CustomEvent) => {
+ // Always update video time, even if outside clip range
const timelineTime = e.detail.time;
- const newVideoTime = Math.max(trimStart, Math.min(
+ const videoTime = Math.max(trimStart, Math.min(
clipDuration - trimEnd,
timelineTime - clipStartTime + trimStart
));
- video.currentTime = newVideoTime;
+ video.currentTime = videoTime;
};
- const handleUpdate = (e: CustomEvent) => {
+ const handleUpdateEvent = (e: CustomEvent) => {
+ // Always update video time, even if outside clip range
const timelineTime = e.detail.time;
- const targetVideoTime = Math.max(trimStart, Math.min(
+ const targetTime = Math.max(trimStart, Math.min(
clipDuration - trimEnd,
timelineTime - clipStartTime + trimStart
));
@@@ -59,14 -71,14 +61,14 @@@
video.playbackRate = e.detail.speed;
};
- window.addEventListener("playback-seek", handleSeek as EventListener);
- window.addEventListener("playback-update", handleUpdate as EventListener);
+ window.addEventListener("playback-seek", handleSeekEvent as EventListener);
+ window.addEventListener("playback-update", handleUpdateEvent as EventListener);
- window.addEventListener("playback-speed", handleSpeedEvent as EventListener);
+ window.addEventListener("playback-speed", handleSpeed as EventListener);
return () => {
- window.removeEventListener("playback-seek", handleSeek as EventListener);
- window.removeEventListener("playback-update", handleUpdate as EventListener);
+ window.removeEventListener("playback-seek", handleSeekEvent as EventListener);
+ window.removeEventListener("playback-update", handleUpdateEvent as EventListener);
- window.removeEventListener("playback-speed", handleSpeedEvent as EventListener);
+ window.removeEventListener("playback-speed", handleSpeed as EventListener);
};
}, [clipStartTime, trimStart, trimEnd, clipDuration, isInClipRange]);