diff options
| author | Brianna | 2017-09-02 09:49:35 -0400 |
|---|---|---|
| committer | GitHub | 2017-09-02 09:49:35 -0400 |
| commit | 22978a0635e906f8ebfa1de81cdc38fd96aad756 (patch) | |
| tree | 2dc5e033a4073d433aaa824113467032d35ca3c1 /src/components/video.py | |
| parent | 39d6a4e5af94a8aa612a009bbe235715b84e7abc (diff) | |
| parent | 8411857030d92e448d5c64682f396e677161afbe (diff) | |
Undo feature
Diffstat (limited to 'src/components/video.py')
| -rw-r--r-- | src/components/video.py | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/components/video.py b/src/components/video.py index a189f60..8ad21b5 100644 --- a/src/components/video.py +++ b/src/components/video.py @@ -52,7 +52,6 @@ class Component(Component): else: self.page.label_volume.setEnabled(False) self.page.spinBox_volume.setEnabled(False) - super().update() def previewRender(self): self.updateChunksize() @@ -118,8 +117,9 @@ class Component(Component): ) if filename: self.settings.setValue("componentDir", os.path.dirname(filename)) + self.mergeUndo = False self.page.lineEdit_video.setText(filename) - self.update() + self.mergeUndo = True def getPreviewFrame(self, width, height): if not self.videoPath or not os.path.exists(self.videoPath): @@ -139,16 +139,23 @@ class Component(Component): '-frames:v', '1', ]) - logFilename = os.path.join( - self.core.logDir, 'preview_%s.log' % str(self.compPos)) - log.debug('Creating ffmpeg process (log at %s)' % logFilename) - with open(logFilename, 'w') as logf: - logf.write(" ".join(command) + '\n\n') - with open(logFilename, 'a') as logf: + if self.core.logEnabled: + logFilename = os.path.join( + self.core.logDir, 'preview_%s.log' % str(self.compPos)) + log.debug('Creating ffmpeg process (log at %s)' % logFilename) + with open(logFilename, 'w') as logf: + logf.write(" ".join(command) + '\n\n') + with open(logFilename, 'a') as logf: + pipe = openPipe( + command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, + stderr=logf, bufsize=10**8 + ) + else: pipe = openPipe( command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, - stderr=logf, bufsize=10**8 + stderr=subprocess.DEVNULL, bufsize=10**8 ) + byteFrame = pipe.stdout.read(self.chunkSize) closePipe(pipe) |
