From 1297af61c9ce00b6dd76f8ec690baedf5bf887c7 Mon Sep 17 00:00:00 2001
From: tassaron
Date: Sat, 29 Jul 2017 20:27:46 -0400
Subject: waveform component is working, preview is glitchy

---
 src/video_thread.py | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

(limited to 'src/video_thread.py')

diff --git a/src/video_thread.py b/src/video_thread.py
index f27ec21..5963def 100644
--- a/src/video_thread.py
+++ b/src/video_thread.py
@@ -19,9 +19,11 @@ import time
 import signal
 
 from component import ComponentError
-from toolkit import openPipe
-from toolkit.ffmpeg import readAudioFile, createFfmpegCommand
 from toolkit.frame import Checkerboard
+from toolkit.ffmpeg import (
+    openPipe, readAudioFile,
+    getAudioDuration, createFfmpegCommand
+)
 
 
 class Worker(QtCore.QObject):
@@ -132,15 +134,24 @@ class Worker(QtCore.QObject):
         # =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~==~=~=~=~=~=~=~=~=~=~=~=~=~=~
         # READ AUDIO, INITIALIZE COMPONENTS, OPEN A PIPE TO FFMPEG
         # =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~==~=~=~=~=~=~=~=~=~=~=~=~=~=~
-
-        self.progressBarSetText.emit("Loading audio file...")
-        audioFileTraits = readAudioFile(
-            self.inputFile, self
-        )
-        if audioFileTraits is None:
-            self.cancelExport()
-            return
-        self.completeAudioArray, duration = audioFileTraits
+        if any([
+                True if 'pcm' in comp.properties() else False
+                for comp in self.components
+                ]):
+            self.progressBarSetText.emit("Loading audio file...")
+            audioFileTraits = readAudioFile(
+                self.inputFile, self
+            )
+            if audioFileTraits is None:
+                self.cancelExport()
+                return
+            self.completeAudioArray, duration = audioFileTraits
+        else:
+            duration = getAudioDuration(self.inputFile)
+            class FakeList:
+                def __len__(self):
+                    return int((duration * 44100) + 44100) - 1470
+            self.completeAudioArray = FakeList()
 
         self.progressBarUpdate.emit(0)
         self.progressBarSetText.emit("Starting components...")
@@ -284,7 +295,10 @@ class Worker(QtCore.QObject):
 
         numpy.seterr(all='print')
 
-        self.out_pipe.stdin.close()
+        try:
+            self.out_pipe.stdin.close()
+        except BrokenPipeError:
+            print('Broken pipe to ffmpeg!')
         if self.out_pipe.stderr is not None:
             print(self.out_pipe.stderr.read())
             self.out_pipe.stderr.close()
-- 
cgit v1.2.3