aboutsummaryrefslogtreecommitdiff
path: root/video_thread.py
diff options
context:
space:
mode:
authorDH42017-06-03 00:07:30 -0500
committerDH42017-06-03 00:07:30 -0500
commit4b566601772a00e354e0f144bb3dc76ed043be4f (patch)
tree06ca9586e2c6e81a0c1e4883d99530cf68ec49c7 /video_thread.py
parente33caa9179e972bc7ffdad0761d020e977559a5d (diff)
Changed encoding update to signal/slot.
Diffstat (limited to 'video_thread.py')
-rw-r--r--video_thread.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/video_thread.py b/video_thread.py
index 64bbd5f..4032c27 100644
--- a/video_thread.py
+++ b/video_thread.py
@@ -19,6 +19,7 @@ class Worker(QtCore.QObject):
videoCreated = pyqtSignal()
progressBarUpdate = pyqtSignal(int)
progressBarSetText = pyqtSignal(str)
+ encoding = pyqtSignal(bool)
def __init__(self, parent=None):
QtCore.QObject.__init__(self)
@@ -85,6 +86,7 @@ class Worker(QtCore.QObject):
@pyqtSlot(str, str, str, list)
def createVideo(self, backgroundImage, inputFile, outputFile, components):
+ self.encoding.emit(True)
self.components = components
self.outputFile = outputFile
self.reset()
@@ -250,10 +252,8 @@ class Worker(QtCore.QObject):
self.parent.drawPreview()
self.core.deleteTempDir()
self.stopped = True
+ self.encoding.emit(False)
self.videoCreated.emit()
- self.parent.changeEncodingStatus(False)
-
- return
def updateProgress(self, pStr, pVal):
self.progressBarValue.emit(pVal)
@@ -273,7 +273,6 @@ class Worker(QtCore.QObject):
def reset(self):
self.core.reset()
-
self.canceled = False
for comp in self.components:
comp.reset()