Merge pull request #667 from stefansaraev/vdr

vdr-addon: make vdr video dir configurable
This commit is contained in:
Stefan Saraev 2012-05-16 04:29:30 -07:00
commit 5c1096f1b5
4 changed files with 10 additions and 2 deletions

View File

@ -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" />

View File

@ -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

View File

@ -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>

View File

@ -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" />