diff --git a/packages/studio/src/player/hooks/useTimelinePlayer.ts b/packages/studio/src/player/hooks/useTimelinePlayer.ts index 93e1c46fbc..ff2d3a0261 100644 --- a/packages/studio/src/player/hooks/useTimelinePlayer.ts +++ b/packages/studio/src/player/hooks/useTimelinePlayer.ts @@ -190,7 +190,7 @@ export function useTimelinePlayer() { const rawLoopStart = inPoint !== null ? inPoint : 0; const loopEnd = rawLoopStart < rawLoopEnd ? rawLoopEnd : dur; const loopStart = rawLoopStart < rawLoopEnd ? rawLoopStart : 0; - if (time >= loopEnd && !adapter.isPlaying()) { + if (time >= loopEnd) { if (usePlayerStore.getState().loopEnabled && dur > 0) { adapter.seek(loopStart); liveTime.notify(loopStart); @@ -199,6 +199,7 @@ export function useTimelinePlayer() { rafRef.current = requestAnimationFrame(tick); return; } + if (adapter.isPlaying()) adapter.pause(); setCurrentTime(time); // sync Zustand once at end setIsPlaying(false); cancelAnimationFrame(rafRef.current); @@ -246,7 +247,7 @@ export function useTimelinePlayer() { const adapter = getAdapter(); if (!adapter) return; if (adapter.getTime() >= adapter.getDuration()) { - adapter.seek(0); + adapter.seek(usePlayerStore.getState().inPoint ?? 0); } unmutePreviewMedia(iframeRef.current); applyPlaybackRate(usePlayerStore.getState().playbackRate); diff --git a/packages/studio/src/player/store/playerStore.ts b/packages/studio/src/player/store/playerStore.ts index 71d8d2d722..4b96c2634a 100644 --- a/packages/studio/src/player/store/playerStore.ts +++ b/packages/studio/src/player/store/playerStore.ts @@ -113,8 +113,23 @@ export const usePlayerStore = create((set) => ({ }, setLoopEnabled: (enabled) => set({ loopEnabled: enabled }), setZoomMode: (mode) => set({ zoomMode: mode }), - setInPoint: (time) => set({ inPoint: time !== null && Number.isFinite(time) ? time : null }), - setOutPoint: (time) => set({ outPoint: time !== null && Number.isFinite(time) ? time : null }), + setInPoint: (time) => + set((state) => { + const t = time !== null && Number.isFinite(time) ? time : null; + return { + inPoint: t, + outPoint: + t !== null && state.outPoint !== null && t >= state.outPoint ? null : state.outPoint, + }; + }), + setOutPoint: (time) => + set((state) => { + const t = time !== null && Number.isFinite(time) ? time : null; + return { + outPoint: t, + inPoint: t !== null && state.inPoint !== null && t <= state.inPoint ? null : state.inPoint, + }; + }), setManualZoomPercent: (percent) => set({ manualZoomPercent: Math.max(10, Math.min(2000, Math.round(percent))) }), setCurrentTime: (time) => set({ currentTime: Number.isFinite(time) ? time : 0 }),