From 412ce067b613cdbc8e269242a6436e5fc90bb585 Mon Sep 17 00:00:00 2001
From: albfan <albertofanjul@gmail.com>
Date: Sat, 23 Jul 2016 19:15:38 +0200
Subject: [PATCH] Use resolution provided to resize viewer

---
 res/gstplayer     | 12 +++++++-----
 src/ctl/sinkctl.c | 26 ++++++++++++--------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/res/gstplayer b/res/gstplayer
index b1d3c08..d20d53f 100755
--- a/res/gstplayer
+++ b/res/gstplayer
@@ -19,12 +19,14 @@ Gst.init(None)
 class Player(object):
     def __init__(self, **kwargs):
 
+        resolution = kwargs.get("resolution")
+        if resolution:
+            split = resolution.split("x")
+            self.width = int(split[0])
+            self.height = int(split[1])
+
         scale = kwargs.get("scale")
-        #scale = "1080x1920"
-        if not scale:
-            self.width = 800
-            self.height = 600
-        else:
+        if scale:
             split = scale.split("x")
             self.width = int(split[0])
             self.height = int(split[1])
diff --git a/src/ctl/sinkctl.c b/src/ctl/sinkctl.c
index e594a50..5c335f2 100644
--- a/src/ctl/sinkctl.c
+++ b/src/ctl/sinkctl.c
@@ -389,7 +389,6 @@ void launch_player(struct ctl_sink *s) {
 	int i = 0;
 	char* player;
 	if (uibc) {
-//		player = "gstplayer";
 		player = "uibc-viewer";
 	} else {
 		player = "miracle-gst";
@@ -400,27 +399,26 @@ void launch_player(struct ctl_sink *s) {
 		argv[i++] = s->target;
 		sprintf(uibc_portStr, "%d", uibc_port);
 		argv[i++] = uibc_portStr;
-//		argv[i++] = "--daemon";
 	}
-		if (cli_max_sev >= 7)
-			argv[i++] = "-d 3";
-		if (gst_audio_en)
-			argv[i++] = "-a";
-		if (gst_scale_res) {
-			argv[i++] = "-s";
-			argv[i++] = gst_scale_res;
-		}
+	if (cli_max_sev >= 7)
+		argv[i++] = "-d 3";
+	if (gst_audio_en)
+		argv[i++] = "-a";
+	if (gst_scale_res) {
+		argv[i++] = "-s";
+		argv[i++] = gst_scale_res;
+	}
 	argv[i++] = "-p";
 	sprintf(port, "%d", rstp_port);
 	argv[i++] = port;
 
 	if (s->hres && s->vres) {
 		sprintf(resolution, "%dx%d", s->hres, s->vres);
-			argv[i++] = "-r";
-			argv[i++] = resolution;
-		}
+		argv[i++] = "-r";
+		argv[i++] = resolution;
+	}
 
-		argv[i] = NULL;
+   argv[i] = NULL;
 
 	i = 0;
    int size = 0;