Changed encoding update to signal/slot.

This commit is contained in:
DH4 2017-06-03 00:07:30 -05:00
parent e33caa9179
commit 4b56660177
3 changed files with 7 additions and 8 deletions

View File

@ -260,7 +260,6 @@ class Main(QtCore.QObject):
# create output video if mandatory settings are filled in
if self.window.lineEdit_audioFile.text() and self.window.lineEdit_outputFile.text():
self.canceled = False
self.changeEncodingStatus(True)
self.progressBarUpdated(-1)
ffmpeg_cmd = self.settings.value("ffmpeg_cmd", expanduser("~"))
self.videoThread = QtCore.QThread(self)
@ -269,7 +268,8 @@ class Main(QtCore.QObject):
self.videoWorker.videoCreated.connect(self.videoCreated)
self.videoWorker.progressBarUpdate.connect(self.progressBarUpdated)
self.videoWorker.progressBarSetText.connect(self.progressBarSetText)
self.videoWorker.imageCreated.connect(self.showPreviewImage)
self.videoWorker.imageCreated.connect(self.showPreviewImage)
self.videoWorker.encoding.connect(self.changeEncodingStatus)
self.videoThread.start()
self.videoTask.emit(self.window.lineEdit_background.text(),
self.window.lineEdit_audioFile.text(),

View File

@ -240,7 +240,7 @@
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@ -712,7 +712,7 @@
<item>
<widget class="QPushButton" name="pushButton_Cancel">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>Cancel</string>

View File

@ -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()