From 3f24beb85790027883b33f678cc0d12a353e35ed Mon Sep 17 00:00:00 2001
From: MaZderMind <git@mazdermind.de>
Date: Sat, 30 Jan 2016 16:18:21 +0100
Subject: force preview-display-scaler to preview-size in x-mode, fixes #53

---
 voctogui/lib/videodisplay.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'voctogui/lib/videodisplay.py')

diff --git a/voctogui/lib/videodisplay.py b/voctogui/lib/videodisplay.py
index 0280e74..8ce1413 100644
--- a/voctogui/lib/videodisplay.py
+++ b/voctogui/lib/videodisplay.py
@@ -6,7 +6,7 @@ from lib.config import Config
 class VideoDisplay(object):
 	""" Displays a Voctomix-Video-Stream into a GtkWidget """
 
-	def __init__(self, drawing_area, port, play_audio=False, level_callback=None):
+	def __init__(self, drawing_area, port, width=None, height=None, play_audio=False, level_callback=None):
 		self.log = logging.getLogger('VideoDisplay[%u]' % port)
 
 		self.drawing_area = drawing_area
@@ -61,11 +61,18 @@ class VideoDisplay(object):
 			"""
 
 		elif videosystem == 'x':
+			prescale_caps = 'video/x-raw'
+			if width and height:
+				prescale_caps += ',width=%u,height=%u' % (width, height)
+
 			pipeline += """
 				videoconvert !
 				videoscale !
+				{prescale_caps} !
 				ximagesink
-			"""
+			""".format(
+				prescale_caps=prescale_caps
+			)
 
 		else:
 			raise Exception('Invalid Videodisplay-System configured: %s'. system)
-- 
cgit v1.2.3