Handle skipping to next preview

This commit is contained in:
Nicolas Mowen 2024-02-26 08:22:04 -07:00
parent 5cbc0443f7
commit 7986b8cf4f
2 changed files with 24 additions and 30 deletions

View File

@ -226,7 +226,7 @@ export default function DynamicVideoPlayer({
player.on("timeupdate", () => {
controller.updateProgress(player.currentTime() || 0);
});
player.on("ended", () => controller.fireClipEndEvent());
player.on("ended", () => controller.fireClipChangeEvent("forward"));
if (onControllerReady) {
onControllerReady(controller);
@ -262,7 +262,7 @@ export default function DynamicVideoPlayer({
previewRef.current = player;
player.pause();
player.on("seeked", () => controller.finishedSeeking());
player.on("loadeddata", () => controller.previewReady())
player.on("loadeddata", () => controller.previewReady());
}}
onDispose={() => {
previewRef.current = undefined;
@ -284,7 +284,8 @@ export class DynamicVideoController {
// playback
private recordings: Recording[] = [];
private onPlaybackTimestamp: ((time: number) => void) | undefined = undefined;
private onClipEnded: (() => void) | undefined = undefined;
private onClipChange: ((dir: "forward" | "backward") => void) | undefined =
undefined;
private annotationOffset: number;
private timeToStart: number | undefined = undefined;
@ -395,13 +396,13 @@ export class DynamicVideoController {
this.onPlaybackTimestamp = listener;
}
onClipEndedEvent(listener: () => void) {
this.onClipEnded = listener;
onClipChangedEvent(listener: (dir: "forward" | "backward") => void) {
this.onClipChange = listener;
}
fireClipEndEvent() {
if (this.onClipEnded) {
this.onClipEnded();
fireClipChangeEvent(dir: "forward" | "backward") {
if (this.onClipChange) {
this.onClipChange(dir);
}
}
@ -410,6 +411,10 @@ export class DynamicVideoController {
return;
}
if (!this.readyToScrub) {
return;
}
if (time > this.preview.end) {
if (this.playerMode == "scrubbing") {
this.playerMode = "playback";
@ -417,35 +422,23 @@ export class DynamicVideoController {
this.timeToSeek = undefined;
this.seeking = false;
this.readyToScrub = false;
this.fireClipEndEvent();
this.fireClipChangeEvent("forward");
}
return;
}
if (!this.readyToScrub) {
return;
}
if (this.playerMode != "scrubbing") {
this.playerMode = "scrubbing";
this.playerRef.current?.pause();
this.setScrubbing(true);
}
console.log(
"scrubbing to " +
time +
" with current seek time " +
this.timeToSeek +
" and current player time " +
this.previewRef.current?.currentTime()
);
if (this.seeking) {
this.timeToSeek = time;
} else {
console.log("player is being seeked to " + Math.max(0, time - this.preview.start))
this.previewRef.current?.currentTime(Math.max(0, time - this.preview.start));
this.previewRef.current?.currentTime(
Math.max(0, time - this.preview.start)
);
this.seeking = true;
}
}
@ -468,8 +461,7 @@ export class DynamicVideoController {
}
previewReady() {
console.log("the preview is ready")
this.previewRef.current?.pause()
this.previewRef.current?.pause();
this.readyToScrub = true;
}
}

View File

@ -48,11 +48,13 @@ export default function DesktopRecordingView({
return;
}
if (selectedRangeIdx < timeRange.ranges.length - 1) {
controllerRef.current.onClipEndedEvent(() => {
controllerRef.current.onClipChangedEvent((dir) => {
if (dir == "forward" && selectedRangeIdx < timeRange.ranges.length - 1) {
setSelectedRangeIdx(selectedRangeIdx + 1);
});
} else if (selectedRangeIdx > 0) {
setSelectedRangeIdx(selectedRangeIdx - 1);
}
});
}, [playerReady, selectedRangeIdx]);
// scrubbing and timeline state