Merge audio-mixing branch

some basic audio features + more user feedback + merging static components

1 files changed, 14 insertions, 16 deletions

diff --git a/src/mainwindow.py b/src/mainwindow.py
index 165b5bd..76ed179 100644
--- a/src/mainwindow.py
+++ b/src/mainwindow.py
@@ -16,7 +16,6 @@ import time
 
 import core
 import preview_thread
-import video_thread
 from presetmanager import PresetManager
 from toolkit import LoadDefaultSettings, disableWhenEncoding, checkOutput
 
@@ -49,9 +48,9 @@ class PreviewWindow(QtWidgets.QLabel):
 
 class MainWindow(QtWidgets.QMainWindow):
 
-    newTask = QtCore.pyqtSignal(list)
+    createVideo = QtCore.pyqtSignal()
+    newTask = QtCore.pyqtSignal(list)  # for the preview window
     processTask = QtCore.pyqtSignal()
-    videoTask = QtCore.pyqtSignal(str, str, list)
 
     def __init__(self, window, project):
         QtWidgets.QMainWindow.__init__(self)
@@ -306,6 +305,7 @@ class MainWindow(QtWidgets.QMainWindow):
         QtWidgets.QShortcut("Ctrl+A", self.window, self.openSaveProjectDialog)
         QtWidgets.QShortcut("Ctrl+O", self.window, self.openOpenProjectDialog)
         QtWidgets.QShortcut("Ctrl+N", self.window, self.createNewProject)
+        QtWidgets.QShortcut("Ctrl+Alt+Shift+R", self.window, self.drawPreview)
 
         QtWidgets.QShortcut(
             "Ctrl+T", self.window,
@@ -496,20 +496,15 @@ class MainWindow(QtWidgets.QMainWindow):
 
         self.canceled = False
         self.progressBarUpdated(-1)
-        self.videoThread = QtCore.QThread(self)
-        self.videoWorker = video_thread.Worker(self)
-        self.videoWorker.moveToThread(self.videoThread)
-        self.videoWorker.videoCreated.connect(self.videoCreated)
+        self.videoWorker = self.core.newVideoWorker(
+            self, audioFile, outputPath
+        )
         self.videoWorker.progressBarUpdate.connect(self.progressBarUpdated)
         self.videoWorker.progressBarSetText.connect(
             self.progressBarSetText)
         self.videoWorker.imageCreated.connect(self.showPreviewImage)
         self.videoWorker.encoding.connect(self.changeEncodingStatus)
-        self.videoThread.start()
-        self.videoTask.emit(
-            audioFile,
-            outputPath,
-            self.core.selectedComponents)
+        self.createVideo.emit()
 
     def changeEncodingStatus(self, status):
         self.encoding = status
@@ -557,19 +552,17 @@ class MainWindow(QtWidgets.QMainWindow):
             self.window.progressLabel.setHidden(True)
             self.drawPreview(True)
 
+    @QtCore.pyqtSlot(int)
     def progressBarUpdated(self, value):
         self.window.progressBar_createVideo.setValue(value)
 
+    @QtCore.pyqtSlot(str)
     def progressBarSetText(self, value):
         if sys.platform == 'darwin':
             self.window.progressLabel.setText(value)
         else:
             self.window.progressBar_createVideo.setFormat(value)
 
-    def videoCreated(self):
-        self.videoThread.quit()
-        self.videoThread.wait()
-
     def updateResolution(self):
         resIndex = int(self.window.comboBox_resolution.currentIndex())
         res = self.resolutions[resIndex].split('x')
@@ -583,6 +576,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.autosave(force)
         self.updateWindowTitle()
 
+    @QtCore.pyqtSlot(QtGui.QImage)
     def showPreviewImage(self, image):
         self.previewWindow.changePixmap(image)
 
@@ -711,6 +705,10 @@ class MainWindow(QtWidgets.QMainWindow):
     def saveCurrentProject(self):
         if self.currentProject:
             self.core.createProjectFile(self.currentProject, self.window)
+            try:
+                os.remove(self.autosavePath)
+            except FileNotFoundError:
+                pass
             self.updateWindowTitle()
         else:
             self.openSaveProjectDialog()