From 62ab09e3f36dcaf6c1a4680dc6c4d048fb2e165c Mon Sep 17 00:00:00 2001
From: tassaron
Date: Sat, 15 Jul 2017 01:00:03 -0400
Subject: Video comp verifies audio streams, videoThread moved into Core

off-by-1 bug fixed in exporting, & use fewer threads for fewer CPUs
---
 src/command.py | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'src/command.py')

diff --git a/src/command.py b/src/command.py
index be194d8..41618f8 100644
--- a/src/command.py
+++ b/src/command.py
@@ -9,13 +9,12 @@ import os
 import sys
 
 import core
-import video_thread
 from toolkit import LoadDefaultSettings
 
 
 class Command(QtCore.QObject):
 
-    videoTask = QtCore.pyqtSignal(str, str, list)
+    createVideo = QtCore.pyqtSignal()
 
     def __init__(self):
         QtCore.QObject.__init__(self)
@@ -112,21 +111,16 @@ class Command(QtCore.QObject):
             quit(1)
 
     def createAudioVisualisation(self, input, output):
-        self.videoThread = QtCore.QThread(self)
-        self.videoWorker = video_thread.Worker(self)
-        self.videoWorker.moveToThread(self.videoThread)
-        self.videoWorker.videoCreated.connect(self.videoCreated)
-
-        self.videoThread.start()
-        self.videoTask.emit(
-          input,
-          output,
-          list(reversed(self.core.selectedComponents))
+        self.core.selectedComponents = list(
+            reversed(self.core.selectedComponents))
+        self.core.componentListChanged()
+        self.worker = self.core.newVideoWorker(
+            self, input, output
         )
+        self.worker.videoCreated.connect(self.videoCreated)
+        self.createVideo.emit()
 
     def videoCreated(self):
-        self.videoThread.quit()
-        self.videoThread.wait()
         quit(0)
 
     def showMessage(self, **kwargs):
-- 
cgit v1.2.3