From d6bd9770468d102bfd067015dfbec1b211f5415e Mon Sep 17 00:00:00 2001
From: Henk Wiedig <henk@wiedig.de>
Date: Wed, 16 May 2012 11:02:15 +0200
Subject: [PATCH] vdr-addon: make vdr video dir configurable

---
 .../addons/service/multimedia/vdr-addon/config/settings.xml  | 1 +
 .../addons/service/multimedia/vdr-addon/source/bin/vdr.start | 3 +--
 .../vdr-addon/source/resources/language/English/strings.xml  | 3 +++
 .../multimedia/vdr-addon/source/resources/settings.xml       | 5 +++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
index 72497ba183..3e4f06fafa 100644
--- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
@@ -1,6 +1,7 @@
 <settings>
     <setting id="WAIT_FOR_FEINIT" value="false" />
     <setting id="REMOVE_MODULES" value="" />
+    <setting id="VDR_VIDEO_DIR" value="/storage/videos" />
     <setting id="ENABLE_DYNAMITE" value="true" />
     <setting id="ENABLE_IPTV" value="false" />
     <setting id="ENABLE_SOFTCAM" value="true" />
diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
index b96d1c2959..3c87b62165 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -32,7 +32,6 @@ ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 
 ADDON_CONFIG_DIR="$ADDON_HOME/config"
 ADDON_PLUGIN_DIR="$ADDON_DIR/plugin"
-ADDON_VIDEO_DIR="$HOME/videos"
 
 if [ ! -f "$ADDON_SETTINGS" ]; then
   mkdir -p $ADDON_HOME
@@ -51,7 +50,7 @@ cp $ADDON_DIR/config/epgsources/epgdata2xmltv/epgdata2xmltv.dist /var/lib/epgsou
 VDR_ARG="-g /tmp --no-kbd --log=3 --port=0"
 VDR_ARG="$VDR_ARG --config=$ADDON_CONFIG_DIR"
 VDR_ARG="$VDR_ARG --lib=$ADDON_PLUGIN_DIR"
-VDR_ARG="$VDR_ARG --video=$ADDON_VIDEO_DIR"
+VDR_ARG="$VDR_ARG --video=\"$VDR_VIDEO_DIR\""
 VDR_ARG="$VDR_ARG -P xvdr"
 
 if [ "$ENABLE_SOFTCAM" == "true" ] ; then
diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
index efb0616f89..63c7a3b21e 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
@@ -2,6 +2,7 @@
 <strings>
 	<string id="1000">DVB</string>
 	<string id="1001">Plugins</string>
+	<string id="1002">VDR</string>
 	<string id="1020">DVB Configuration</string>
 	<string id="1021">Unload DVB mudules before suspend</string>
 	<string id="1022">Wait for frontend initialization</string>
@@ -26,4 +27,6 @@
 	<string id="1048">Enable plugin: xineliboutput</string>
 	<string id="1049">xineliboutput: listen on port</string>
 	<string id="1050">Enable plugin: text2skin</string>
+	<string id="1051">VDR Configuration</string>
+	<string id="1052">VDR Video Dir</string>
 </strings>
diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
index be49d43c64..6153ea7578 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
@@ -6,6 +6,11 @@
 		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
     </category>
+    <category label="1002">
+		<setting label="1051" type="lsep"/>
+		<setting type="sep" />
+                <setting id="VDR_VIDEO_DIR" type="folder" label="1052" value="" default="/storage/videos" />
+    </category>
     <category label="1001">
 		<setting label="1030" type="lsep"/>
 		<setting type="sep" />