From a222fb8be044bbd7de058c4ffaad55d034ae1369 Mon Sep 17 00:00:00 2001
From: Gustavo <gustavobenn@hotmail.com>
Date: Sun, 6 Mar 2016 11:32:17 -0300
Subject: [PATCH] Added custom width/height and audio settings.

thanks @rapidreporter and @asonnema
---
 README.md                               | 1 +
 script.moonlight/addon.xml              | 2 +-
 script.moonlight/bin/service.sh         | 8 +++++++-
 script.moonlight/changelog.txt          | 3 +++
 script.moonlight/resources/settings.xml | 5 ++++-
 script.moonlight/settings-default.xml   | 3 +++
 6 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 77a256d..6c6e57e 100644
--- a/README.md
+++ b/README.md
@@ -17,3 +17,4 @@ Only for Raspberry Pi 2 and Openelec.
 
 ##Bugs
 - Feel free to open a issue.
+- Please provide the following info: OpenELEC version and logs from `Userdata\addon_data\script.moonlight\service.log`
diff --git a/script.moonlight/addon.xml b/script.moonlight/addon.xml
index 07fb1c4..14603f9 100644
--- a/script.moonlight/addon.xml
+++ b/script.moonlight/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.moonlight" name="Moonlight" version="1.0.6" provider-name="dead">
+<addon id="script.moonlight" name="Moonlight" version="1.0.7" provider-name="dead">
     <requires>
         <import addon="xbmc.python" version="2.14.0"/>
     </requires>
diff --git a/script.moonlight/bin/service.sh b/script.moonlight/bin/service.sh
index 572f7cb..a11384a 100644
--- a/script.moonlight/bin/service.sh
+++ b/script.moonlight/bin/service.sh
@@ -28,8 +28,10 @@ do
 
 		if [ "$MOON_RESOLUTION" = "720p" ]; then
 			MOONLIGHT_ARG="$MOONLIGHT_ARG -720"
-		else
+		elif [ "$MOON_RESOLUTION" = "1080p" ]; then
 			MOONLIGHT_ARG="$MOONLIGHT_ARG -1080"
+		else
+			MOONLIGHT_ARG="$MOONLIGHT_ARG -width $MOON_WIDTH_RESOLUTION -height $MOON_HEIGHT_RESOLUTION"
 		fi
 
 		if [ "$MOON_FRAMERATE" = "60" ]; then
@@ -57,6 +59,10 @@ do
 		if [ "$MOON_REMOTE" = "true" ]; then
 			MOONLIGHT_ARG="$MOONLIGHT_ARG -remote"
 		fi
+		
+		if [ "$MOON_AUDIO" != "sysdefault" ]; then
+			MOONLIGHT_ARG="$MOONLIGHT_ARG -audio $MOON_AUDIO"
+		fi
 
 		if [ "$MOON_MAPPING" != "" ]; then
 			MOONLIGHT_ARG="$MOONLIGHT_ARG -mapping \"${ADDON_DIR}/bin/mappings/${MOON_MAPPING}.conf\""
diff --git a/script.moonlight/changelog.txt b/script.moonlight/changelog.txt
index eca6b5f..0ab4ce6 100644
--- a/script.moonlight/changelog.txt
+++ b/script.moonlight/changelog.txt
@@ -1,3 +1,6 @@
+v1.0.7
+Added custom width/height and audio settings.
+
 v1.0.6
 Update to moonlight-embedded 2.1.4
 
diff --git a/script.moonlight/resources/settings.xml b/script.moonlight/resources/settings.xml
index 8dd0fd3..ba31ca1 100644
--- a/script.moonlight/resources/settings.xml
+++ b/script.moonlight/resources/settings.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
     <setting id="MOON_SERVER_IP" type="ipaddress" label="Server IP" default="0.0.0.0"/>
-	<setting id="MOON_RESOLUTION" type="select" values="720p|1080p" label="Resolution" default="720p" />
+	<setting id="MOON_RESOLUTION" type="labelenum" label="Resolution" values="Custom|720p|1080p" default="720p" />
+    <setting id="MOON_WIDTH_RESOLUTION" type="text" label="Width" visible="eq(-1,1)" default="1366" />
+    <setting id="MOON_HEIGHT_RESOLUTION" type="text" label="Height" visible="eq(-2,1)" default="768" />
 	<setting id="MOON_FRAMERATE" type="select" values="30|60" label="FPS" default="30" />
     <setting id="MOON_BITRATE" type="text" label="Bitrate" default="10000" />
 	<setting id="MOON_PACKETSIZE" type="text" label="Packet Size" default="1024" />
@@ -12,4 +14,5 @@
 	<setting id="MOON_SURROUND" type="bool" label="Stream 5.1 surround sound (requires GFE 2.7)" default="false"/>
 	<setting id="MOON_FORCEHW" type="bool" label="Force hardware acceleration" default="true"/>
 	<setting id="MOON_MAPPING" type="select" label="Control Mapping" values="default|dualschock3|dualshock4|rumblepad2|xbox360" default="dualshock4" />
+    <setting id="MOON_AUDIO" type="text" label="Audio Device" default="sysdefault" />
 </settings>
\ No newline at end of file
diff --git a/script.moonlight/settings-default.xml b/script.moonlight/settings-default.xml
index 2bd2573..2ac399b 100644
--- a/script.moonlight/settings-default.xml
+++ b/script.moonlight/settings-default.xml
@@ -10,4 +10,7 @@
     <setting id="MOON_RESOLUTION" value="720p" />
     <setting id="MOON_SERVER_IP" value="0.0.0.0" />
     <setting id="MOON_SURROUND" value="false" />
+    <setting id="MOON_WIDTH_RESOLUTION" value="1366" />
+    <setting id="MOON_HEIGHT_RESOLUTION" value="768" />
+    <setting id="MOON_AUDIO" value="sysdefault" />
 </settings>
\ No newline at end of file