From a3396a6a779a8f1096ef4ddf3fe0a07238185743 Mon Sep 17 00:00:00 2001
From: Mikael Finstad <finstaden@gmail.com>
Date: Sun, 4 Sep 2022 15:06:56 +0200
Subject: [PATCH] fix waveform logic #1269

---
 src/App.jsx       | 29 +++++++++++++----------------
 src/BottomBar.jsx |  6 +++---
 src/Timeline.jsx  |  2 +-
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index be651907..07571054 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -143,9 +143,8 @@ const App = memo(() => {
   const { fileFormat, setFileFormat, detectedFileFormat, setDetectedFileFormat, isCustomFormatSelected } = useFileFormatState();
 
   // State per application launch
+  const [timelineMode, setTimelineMode] = useState();
   const [keyframesEnabled, setKeyframesEnabled] = useState(true);
-  const [waveformEnabled, setWaveformEnabled] = useState(false);
-  const [thumbnailsEnabled, setThumbnailsEnabled] = useState(false);
   const [showRightBar, setShowRightBar] = useState(true);
   const [cleanupChoices, setCleanupChoices] = useState({ tmpFiles: true });
   const [rememberConvertToSupportedFormat, setRememberConvertToSupportedFormat] = useState();
@@ -230,15 +229,13 @@ const App = memo(() => {
     }
   }, [detectedFileFormat, outFormatLocked, setFileFormat, setOutFormatLocked]);
 
-  const setTimelineMode = useCallback((newMode) => {
-    if (newMode === 'waveform') {
-      setWaveformEnabled(v => !v);
-      setThumbnailsEnabled(false);
+  const toggleTimelineMode = useCallback((newMode) => {
+    if (newMode === timelineMode) {
+      setTimelineMode();
     } else {
-      setThumbnailsEnabled(v => !v);
-      setWaveformEnabled(false);
+      setTimelineMode(newMode);
     }
-  }, []);
+  }, [timelineMode]);
 
   const toggleExportConfirmEnabled = useCallback(() => setExportConfirmEnabled((v) => !v), [setExportConfirmEnabled]);
 
@@ -852,6 +849,12 @@ const App = memo(() => {
     setThumbnails(v => [...v, thumbnail]);
   }
 
+  const hasAudio = !!mainAudioStream;
+  const hasVideo = !!mainVideoStream;
+
+  const waveformEnabled = timelineMode === 'waveform' && hasAudio;
+  const thumbnailsEnabled = timelineMode === 'thumbnails' && hasVideo;
+
   const [, cancelRenderThumbnails] = useDebounceOld(() => {
     async function renderThumbnails() {
       if (!thumbnailsEnabled || thumnailsRenderingPromiseRef.current) return;
@@ -888,8 +891,6 @@ const App = memo(() => {
     subtitlesByStreamIdRef.current = subtitlesByStreamId;
   }, [subtitlesByStreamId]);
 
-  const hasAudio = !!mainAudioStream;
-  const hasVideo = !!mainVideoStream;
   const shouldShowKeyframes = keyframesEnabled && !!mainVideoStream && calcShouldShowKeyframes(zoomedDuration);
   const shouldShowWaveform = calcShouldShowWaveform(zoomedDuration);
 
@@ -2323,10 +2324,6 @@ const App = memo(() => {
 
   const thumbnailsSorted = useMemo(() => sortBy(thumbnails, thumbnail => thumbnail.time), [thumbnails]);
 
-  let timelineMode;
-  if (thumbnailsEnabled) timelineMode = 'thumbnails';
-  if (waveformEnabled) timelineMode = 'waveform';
-
   const { t } = useTranslation();
 
   function renderSubtitles() {
@@ -2531,7 +2528,7 @@ const App = memo(() => {
               shortStep={shortStep}
               seekClosestKeyframe={seekClosestKeyframe}
               togglePlay={togglePlay}
-              setTimelineMode={setTimelineMode}
+              toggleTimelineMode={toggleTimelineMode}
               timelineMode={timelineMode}
               hasAudio={hasAudio}
               keyframesEnabled={keyframesEnabled}
diff --git a/src/BottomBar.jsx b/src/BottomBar.jsx
index b6eccac7..667ed56f 100644
--- a/src/BottomBar.jsx
+++ b/src/BottomBar.jsx
@@ -35,7 +35,7 @@ const BottomBar = memo(({
   seekAbs, currentSegIndexSafe, cutSegments, currentCutSeg, setCutStart, setCutEnd,
   setCurrentSegIndex, cutStartTimeManual, setCutStartTimeManual, cutEndTimeManual, setCutEndTimeManual,
   jumpTimelineStart, jumpTimelineEnd, jumpCutEnd, jumpCutStart, startTimeOffset, setCutTime, currentApparentCutSeg,
-  playing, shortStep, togglePlay, setTimelineMode, hasAudio, timelineMode,
+  playing, shortStep, togglePlay, toggleTimelineMode, hasAudio, timelineMode,
   keyframesEnabled, toggleKeyframesEnabled, seekClosestKeyframe, detectedFps,
 }) => {
   const { t } = useTranslation();
@@ -165,7 +165,7 @@ const BottomBar = memo(({
                   style={{ padding: '0 5px', color: timelineMode === 'waveform' ? primaryTextColor : undefined }}
                   role="button"
                   title={t('Show waveform')}
-                  onClick={() => setTimelineMode('waveform')}
+                  onClick={() => toggleTimelineMode('waveform')}
                 />
               )}
               {hasVideo && (
@@ -175,7 +175,7 @@ const BottomBar = memo(({
                     style={{ padding: '0 5px', color: timelineMode === 'thumbnails' ? primaryTextColor : undefined }}
                     role="button"
                     title={t('Show thumbnails')}
-                    onClick={() => setTimelineMode('thumbnails')}
+                    onClick={() => toggleTimelineMode('thumbnails')}
                   />
 
                   <FaKey
diff --git a/src/Timeline.jsx b/src/Timeline.jsx
index f73cb30f..e108822f 100644
--- a/src/Timeline.jsx
+++ b/src/Timeline.jsx
@@ -226,7 +226,7 @@ const Timeline = memo(({
           onScroll={onTimelineScroll}
           ref={timelineScrollerRef}
         >
-          {waveformEnabled && shouldShowWaveform && waveforms && (
+          {waveformEnabled && shouldShowWaveform && waveforms.length > 0 && (
             <Waveforms
               calculateTimelinePercent={calculateTimelinePercent}
               durationSafe={durationSafe}