From 7957315e3fc6ec651e40225cec090149982f94ee Mon Sep 17 00:00:00 2001 From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com> Date: Wed, 13 Mar 2024 22:13:15 -0500 Subject: [PATCH] simplify controller state --- web/src/components/player/dynamic/DynamicVideoController.ts | 5 +---- web/src/components/player/dynamic/DynamicVideoPlayer.tsx | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/web/src/components/player/dynamic/DynamicVideoController.ts b/web/src/components/player/dynamic/DynamicVideoController.ts index 26e8aaf20..c6e7da2d1 100644 --- a/web/src/components/player/dynamic/DynamicVideoController.ts +++ b/web/src/components/player/dynamic/DynamicVideoController.ts @@ -9,7 +9,6 @@ export class DynamicVideoController { public camera = ""; private playerController: HTMLVideoElement; private previewController: PreviewController; - private isScrubbing: boolean; private setFocusedItem: (timeline: Timeline) => void; private playerMode: PlayerMode = "playback"; @@ -24,7 +23,6 @@ export class DynamicVideoController { previewController: PreviewController, annotationOffset: number, defaultMode: PlayerMode, - isScrubbing: boolean, setFocusedItem: (timeline: Timeline) => void, ) { this.camera = camera; @@ -32,7 +30,6 @@ export class DynamicVideoController { this.previewController = previewController; this.annotationOffset = annotationOffset; this.playerMode = defaultMode; - this.isScrubbing = isScrubbing; this.setFocusedItem = setFocusedItem; } @@ -122,7 +119,7 @@ export class DynamicVideoController { this.previewController.setNewPreviewStartTime(time); } - if (scrubResult && this.playerMode != "scrubbing" && !this.isScrubbing) { + if (scrubResult && this.playerMode != "scrubbing") { this.playerMode = "scrubbing"; this.playerController.pause(); } diff --git a/web/src/components/player/dynamic/DynamicVideoPlayer.tsx b/web/src/components/player/dynamic/DynamicVideoPlayer.tsx index 8550eafac..805aeddcc 100644 --- a/web/src/components/player/dynamic/DynamicVideoPlayer.tsx +++ b/web/src/components/player/dynamic/DynamicVideoPlayer.tsx @@ -68,8 +68,7 @@ export default function DynamicVideoPlayer({ playerRef.current, previewController, (config.cameras[camera]?.detect?.annotation_offset || 0) / 1000, - "playback", - isScrubbing, + isScrubbing ? "scrubbing" : "playback", setFocusedItem, ); // we only want to fire once when players are ready