From 32f1fb8df81b5dfc12539090c3fe589099bf165b Mon Sep 17 00:00:00 2001
From: Michael Foiani <sotech117@michaels-mbp-3.devices.brown.edu>
Date: Wed, 4 May 2022 04:43:22 -0400
Subject: Pause works with presentation now.

---
 .../collections/collectionFreeForm/CollectionFreeFormView.tsx      | 7 ++++++-
 src/client/views/nodes/VideoBox.tsx                                | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/client/views')

diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 214d4bbdc..9e57bca4f 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -968,7 +968,12 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
         // set the current respective FFview to the tab being panned.
         Doc.UserDoc()?.presentationMode === 'recording' && RecordingApi.Instance.setRecordingFFView(this);
         // TODO: make this based off the specific recording FFView
-        Doc.UserDoc()?.presentationMode !== 'recording' && RecordingApi.Instance.setPlayFFView(this);
+        Doc.UserDoc()?.presentationMode === 'none' && RecordingApi.Instance.setPlayFFView(this);
+        if (Doc.UserDoc()?.presentationMode === 'watching') {
+            Doc.UserDoc().presentationMode = 'none';
+            // RecordingApi.Instance.pauseMovements();
+            RecordingApi.Instance.pauseVideoAndMovements();
+        }
 
         if (!this.isAnnotationOverlay && clamp) {
             // this section wraps the pan position, horizontally and/or vertically whenever the content is panned out of the viewing bounds
diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx
index 15a198a00..1ff77e373 100644
--- a/src/client/views/nodes/VideoBox.tsx
+++ b/src/client/views/nodes/VideoBox.tsx
@@ -156,7 +156,7 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
     @action public Play = (update: boolean = true) => {
         // if presentation isn't null, call followmovements on the recording api
         if (this.presentation) {
-            const err = RecordingApi.Instance.playMovements(this.presentation, this.player?.currentTime || 0);
+            const err = RecordingApi.Instance.playMovements(this.presentation, this.player?.currentTime || 0, this);
             err && console.log(err)
         }
 
-- 
cgit v1.2.3-70-g09d2