aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2022-06-06 00:03:38 -0400
committerbobzel <zzzman@gmail.com>2022-06-06 00:03:38 -0400
commitd0bba137a8dcba254e844ff983f27120df306dc0 (patch)
tree1496328f30889c556ae53eb37863345b8b960d15
parent716dd83325074aa2016e3993ff13c6f7001dc3df (diff)
fixed recorded videos so that they can be played back. fixed regiontimer to be turned off after pausing a video to not prevent the video from being played again. removed dictation from stackedtimeline rendering.
-rw-r--r--src/client/views/collections/CollectionStackedTimeline.tsx2
-rw-r--r--src/client/views/nodes/VideoBox.tsx9
2 files changed, 7 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionStackedTimeline.tsx b/src/client/views/collections/CollectionStackedTimeline.tsx
index 5a1cc4ded..ca0b9d3d3 100644
--- a/src/client/views/collections/CollectionStackedTimeline.tsx
+++ b/src/client/views/collections/CollectionStackedTimeline.tsx
@@ -699,7 +699,7 @@ export class CollectionStackedTimeline extends CollectionSubView<CollectionStack
PanelHeight={this.timelineContentHeight}
PanelWidth={this.timelineContentWidth}
/>
- {this.renderDictation}
+ {/* {this.renderDictation} */}
<div
className="collectionStackedTimeline-current"
diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx
index ac848fc2a..0017e5f5e 100644
--- a/src/client/views/nodes/VideoBox.tsx
+++ b/src/client/views/nodes/VideoBox.tsx
@@ -199,7 +199,10 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
this._youtubePlayer && SelectionManager.DeselectAll(); // if we don't deselect the player, then we get an annoying YouTube spinner I guess telling us we're paused.
this._playTimer = undefined;
this.updateTimecode();
- if (!this._finished) clearTimeout(this._playRegionTimer); // if paused in the middle of playback, prevents restart on next play
+ if (!this._finished) {
+ clearTimeout(this._playRegionTimer); // if paused in the middle of playback, prevents restart on next play
+ }
+ this._playRegionTimer = undefined;
}
// toggles video full screen
@@ -306,7 +309,7 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
this.layoutDoc._height = NumCast(this.layoutDoc._width) / aspect;
if (Number.isFinite(this.player!.duration)) {
this.rawDuration = this.player!.duration;
- }
+ } else this.rawDuration = NumCast(this.dataDoc[this.fieldKey + "-duration"]);
});
@@ -536,6 +539,7 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
@action
playFrom = (seekTimeInSeconds: number, endTime?: number, fullPlay: boolean = false) => {
clearTimeout(this._playRegionTimer);
+ this._playRegionTimer = undefined;
if (Number.isNaN(this.player?.duration)) {
setTimeout(() => this.playFrom(seekTimeInSeconds, endTime), 500);
}
@@ -559,7 +563,6 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
// removes from currently playing if playback has reached end of range marker
else this.removeCurrentlyPlaying();
this.Pause();
- this._playRegionTimer = undefined;
}, playRegionDuration * 1000);
} else {
this.Pause();