xstefen/OpenCut
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge conflicts, merge

Browse Source
This commit is contained in:
Hyteq
2025-06-24 08:22:24 +03:00
parent e29e0892ac 612d0d8c15
commit 65bff0d2da
9 changed files with 307 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/web/src/components/ui/video-player.tsx
View File

@ -34,7 +34,8 @@ export function VideoPlayer({
const video = videoRef.current;
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 videoTime = Math.max(trimStart, Math.min(
clipDuration - trimEnd,
@ -43,7 +44,8 @@ export function VideoPlayer({
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 targetTime = Math.max(trimStart, Math.min(
clipDuration - trimEnd,
@ -59,13 +61,13 @@ export function VideoPlayer({
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", 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", handleSpeed as EventListener);
};
}, [clipStartTime, trimStart, trimEnd, clipDuration, isInClipRange]);