From ea377bcd055b245a00e1a7c54c076e3eb5b6ae0e Mon Sep 17 00:00:00 2001
From: HDKiller <hdkiller@gmail.com>
Date: Sun, 17 Sep 2017 07:29:25 +0200
Subject: [PATCH] add new parameter (-4k) and remove obsolete ones (-mapping)
 since controller config now comes from gamecontrollerdb

---
 script.moonlight/bin/moonlight.sh       | 2 ++
 script.moonlight/resources/settings.xml | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/script.moonlight/bin/moonlight.sh b/script.moonlight/bin/moonlight.sh
index e389041..69a5aff 100644
--- a/script.moonlight/bin/moonlight.sh
+++ b/script.moonlight/bin/moonlight.sh
@@ -33,6 +33,8 @@ while [ 1 ]; do
 			MOONLIGHT_ARG="$MOONLIGHT_ARG -720"
 		elif [ "$MOON_RESOLUTION" = "1080p" ]; then
 			MOONLIGHT_ARG="$MOONLIGHT_ARG -1080"
+		elif [ "$MOON_RESOLUTION" = "4k" ]; then
+			MOONLIGHT_ARG="$MOONLIGHT_ARG -4k"
 		else
 			MOONLIGHT_ARG="$MOONLIGHT_ARG -width $MOON_WIDTH_RESOLUTION -height $MOON_HEIGHT_RESOLUTION"
 		fi
diff --git a/script.moonlight/resources/settings.xml b/script.moonlight/resources/settings.xml
index d035ecd..8e9af2f 100644
--- a/script.moonlight/resources/settings.xml
+++ b/script.moonlight/resources/settings.xml
@@ -1,7 +1,7 @@
 <?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="labelenum" label="Resolution" values="Custom|720p|1080p" default="720p" />
+	<setting id="MOON_RESOLUTION" type="labelenum" label="Resolution" values="Custom|720p|1080p|4k" default="720p" />
 	<setting id="MOON_WIDTH_RESOLUTION" type="text" label="Width" visible="eq(-1,0)" default="1366" />
 	<setting id="MOON_HEIGHT_RESOLUTION" type="text" label="Height" visible="eq(-2,0)" default="768" />
 	<setting id="MOON_FRAMERATE" type="select" values="30|60" label="FPS" default="30" />
@@ -13,6 +13,5 @@
 	<setting id="MOON_LOCALAUDIO" type="bool" label="Play audio locally" default="false"/>
 	<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|dualshock3|dualshock3alt|dualshock4|rumblepad2|xbox360" default="dualshock4" />
 	<setting id="MOON_AUDIO" type="text" label="Audio Device" default="sysdefault" />
-</settings>
\ No newline at end of file
+</settings>