Added automatic scaling of Image and bars. Set title x/y position, and font size based on scale.

1 files changed, 11 insertions, 11 deletions

diff --git a/video_thread.py b/video_thread.py
index fe1f6f6..5b9a896 100644
--- a/video_thread.py
+++ b/video_thread.py
@@ -15,10 +15,10 @@ class Worker(QtCore.QObject):
 
   def __init__(self, parent=None):
     QtCore.QObject.__init__(self)
-    self.settings = parent.settings
-    parent.videoTask.connect(self.createVideo)
     self.core = core.Core()
-
+    self.core.settings = parent.settings
+    parent.videoTask.connect(self.createVideo)
+    
 
   @pyqtSlot(str, str, QtGui.QFont, int, int, int, int, tuple, tuple, str, str)
   def createVideo(self, backgroundImage, titleText, titleFont, fontSize, alignment,\
@@ -53,7 +53,7 @@ class Worker(QtCore.QObject):
 
     # test if user has libfdk_aac
     encoders = sp.check_output(self.core.FFMPEG_BIN + " -encoders -hide_banner", shell=True)
-    acodec = self.settings.value('outputAudioCodec')
+    acodec = self.core.settings.value('outputAudioCodec')
 
     if b'libfdk_aac' in encoders and acodec == 'aac':
       acodec = 'libfdk_aac'
@@ -62,18 +62,18 @@ class Worker(QtCore.QObject):
        '-y', # (optional) means overwrite the output file if it already exists.
        '-f', 'rawvideo',
        '-vcodec', 'rawvideo',
-       '-s', self.settings.value('outputWidth')+'x'+self.settings.value('outputHeight'), # size of one frame
+       '-s', self.core.settings.value('outputWidth')+'x'+self.core.settings.value('outputHeight'), # size of one frame
        '-pix_fmt', 'rgb24',
-       '-r', self.settings.value('outputFrameRate'), # frames per second
+       '-r', self.core.settings.value('outputFrameRate'), # frames per second
        '-i', '-', # The input comes from a pipe
        '-an',
        '-i', inputFile,
        '-acodec', acodec, # output audio codec
-       '-b:a', self.settings.value('outputAudioBitrate'),
-       '-vcodec', self.settings.value('outputVideoCodec'),
-       '-pix_fmt', self.settings.value('outputVideoFormat'),
-       '-preset', self.settings.value('outputPreset'),
-       '-f', self.settings.value('outputFormat')]
+       '-b:a', self.core.settings.value('outputAudioBitrate'),
+       '-vcodec', self.core.settings.value('outputVideoCodec'),
+       '-pix_fmt', self.core.settings.value('outputVideoFormat'),
+       '-preset', self.core.settings.value('outputPreset'),
+       '-f', self.core.settings.value('outputFormat')]
 
     if acodec == 'aac':
       ffmpegCommand.append('-strict')