From a4b3114f3792c80e20a3f40053ec4724729c1100 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Fri, 24 Sep 2021 00:40:30 -0400
Subject: added doubleclick on clip button to switch to editing entire timeline
 vs. single click to edit just the clip. fixed some audio timeline bugs with
 printing out current time and time span when trimming.  cleaned up
 audioWaveform bucket fields.

---
 src/client/views/collections/CollectionStackedTimeline.tsx | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/client/views/collections')

diff --git a/src/client/views/collections/CollectionStackedTimeline.tsx b/src/client/views/collections/CollectionStackedTimeline.tsx
index e00e66295..7859d3c3f 100644
--- a/src/client/views/collections/CollectionStackedTimeline.tsx
+++ b/src/client/views/collections/CollectionStackedTimeline.tsx
@@ -50,7 +50,6 @@ import { DragManager } from "../../util/DragManager";
 type PanZoomDocument = makeInterface<[]>;
 const PanZoomDocument = makeInterface();
 export type CollectionStackedTimelineProps = {
-    clipDuration: number;
     Play: () => void;
     Pause: () => void;
     playLink: (linkDoc: Doc) => void;
@@ -65,6 +64,7 @@ export type CollectionStackedTimelineProps = {
     trimming: boolean;
     clipStart: number;
     clipEnd: number;
+    clipDuration: number;
     trimStart: () => number;
     trimEnd: () => number;
     trimDuration: () => number;
@@ -165,8 +165,8 @@ export class CollectionStackedTimeline extends CollectionSubView<
     }
     toTimeline = (screen_delta: number, width: number) => {
         return Math.max(
-            this.trimStart,
-            Math.min(this.trimEnd, (screen_delta / width) * this.props.trimDuration() + this.trimStart));
+            this.props.clipStart,
+            Math.min(this.props.clipEnd, (screen_delta / width) * this.props.clipDuration + this.props.clipStart));
     }
 
     rangeClickScript = () => CollectionStackedTimeline.RangeScript;
@@ -282,12 +282,7 @@ export class CollectionStackedTimeline extends CollectionSubView<
                 this.props.isSelected(true) || this.props.isContentActive(),
                 undefined,
                 () => {
-                    !wasPlaying &&
-                        (this.props.trimming && this.clipDuration ?
-                            this.props.setTime(((clientX - rect.x) / rect.width) * this.clipDuration)
-                            :
-                            this.props.setTime(((clientX - rect.x) / rect.width) * this.props.trimDuration() + this.trimStart)
-                        );
+                    !wasPlaying && this.props.setTime(((clientX - rect.x) / rect.width) * this.clipDuration + this.props.clipStart);
                 }
             );
         }
-- 
cgit v1.2.3-70-g09d2