From a9ff0c90656de71e37edafba68e946807d41403f Mon Sep 17 00:00:00 2001
From: Michael Foiani <sotech117@michaels-mbp-3.devices.brown.edu>
Date: Wed, 4 May 2022 13:36:13 -0400
Subject: fix infinite pause/play bug with a stopper, but still very buggy

---
 src/client/util/RecordingApi.ts                      |  3 ++-
 .../collectionFreeForm/CollectionFreeFormView.tsx    |  4 ++--
 .../views/nodes/RecordingBox/RecordingView.scss      | 20 ++++++++++++--------
 .../views/nodes/RecordingBox/RecordingView.tsx       |  2 +-
 src/client/views/nodes/VideoBox.tsx                  |  5 +++++
 5 files changed, 22 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/client/util/RecordingApi.ts b/src/client/util/RecordingApi.ts
index 8fb503b00..fec579486 100644
--- a/src/client/util/RecordingApi.ts
+++ b/src/client/util/RecordingApi.ts
@@ -188,7 +188,7 @@ export class RecordingApi {
         // TODO: set userdoc presentMode to browsing
         this.timers?.map(timer => clearTimeout(timer))
 
-        this.videoBox = null;
+        // this.videoBox = null;
     }
     
     private videoBox: VideoBox | null = null;
@@ -236,6 +236,7 @@ export class RecordingApi {
             }, timeDiff))
             return arr;
         }, [])
+
     }
 
     // Unfinished code for tracing multiple free form views
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 9e57bca4f..aa2e0c417 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -970,9 +970,9 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
         // TODO: make this based off the specific recording FFView
         Doc.UserDoc()?.presentationMode === 'none' && RecordingApi.Instance.setPlayFFView(this);
         if (Doc.UserDoc()?.presentationMode === 'watching') {
-            Doc.UserDoc().presentationMode = 'none';
-            // RecordingApi.Instance.pauseMovements();
             RecordingApi.Instance.pauseVideoAndMovements();
+            Doc.UserDoc().presentationMode = 'none';
+            // RecordingApi.Instance.pauseMovements()
         }
 
         if (!this.isAnnotationOverlay && clamp) {
diff --git a/src/client/views/nodes/RecordingBox/RecordingView.scss b/src/client/views/nodes/RecordingBox/RecordingView.scss
index 1fea231b7..d1a50a82e 100644
--- a/src/client/views/nodes/RecordingBox/RecordingView.scss
+++ b/src/client/views/nodes/RecordingBox/RecordingView.scss
@@ -1,9 +1,11 @@
 video {
-      flex: 100%;
+    // flex: 100%;
       width: 100%;
-      min-height: 400px;
-      height: auto;
-      display: block;
+      // min-height: 400px;
+      //height: auto;
+      height: 100%;
+      //display: block;
+      object-fit: cover;
       background-color: black;
 }
 
@@ -14,18 +16,20 @@ button {
 .recording-container {
       height: 100%;
       width: 100%;
-      display: flex;
+      // display: flex;
       pointer-events: all;
+      background-color: grey;
 }
 
 .video-wrapper {
-      max-width: 600px;
-      max-width: 700px;
+    //   max-width: 600px;
+    //   max-width: 700px;
       position: relative;
       display: flex;
       justify-content: center;
-      overflow: hidden;
+    //   overflow: hidden;
       border-radius: 10px;
+      margin: 0;
 }
 
 .video-wrapper:hover .controls {
diff --git a/src/client/views/nodes/RecordingBox/RecordingView.tsx b/src/client/views/nodes/RecordingBox/RecordingView.tsx
index f7446b556..e7e431b49 100644
--- a/src/client/views/nodes/RecordingBox/RecordingView.tsx
+++ b/src/client/views/nodes/RecordingBox/RecordingView.tsx
@@ -258,7 +258,7 @@ export function RecordingView(props: IRecordingViewProps) {
             return toTwoDigit(minutes) + " : " + toTwoDigit(seconds);
       }
 
-      return (
+    return (
             <div className="recording-container">
                   <div className="video-wrapper">
                         <video id="video"
diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx
index 1ff77e373..226c2b1ce 100644
--- a/src/client/views/nodes/VideoBox.tsx
+++ b/src/client/views/nodes/VideoBox.tsx
@@ -154,6 +154,11 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
 
     // plays video
     @action public Play = (update: boolean = true) => {
+        if (Doc.UserDoc().presentationMode === 'watching' && !this._playing) {
+            console.log('VideoBox : Play : presentation mode', this._playing);
+            return;
+        }
+
         // 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, this);
-- 
cgit v1.2.3-70-g09d2