vdr-addon: config & startup enhancements

This commit is contained in:
Stefan Saraev 2012-03-09 00:04:49 +02:00
parent ce2be684a0
commit d4ce3187f8
3 changed files with 19 additions and 38 deletions

View File

@ -1,10 +1,10 @@
<settings>
<setting id="REMOVE_MODULES" value="" />
<setting id="enable_dynamite" value="true" />
<setting id="enable_iptv" value="false" />
<setting id="enable_softcam" value="true" />
<setting id="enable_streamdev_client" value="false" />
<setting id="enable_streamdev_server" value="false" />
<setting id="enable_wirbelscan" value="true" />
<setting id="softcam_plugin" value="sc" />
<setting id="ENABLE_DYNAMITE" value="true" />
<setting id="ENABLE_IPTV" value="false" />
<setting id="ENABLE_SOFTCAM" value="true" />
<setting id="ENABLE_STREAMDEV_CLIENT" value="false" />
<setting id="ENABLE_STREAMDEV_SERVER" value="false" />
<setting id="ENABLE_WIRBELSCAN" value="true" />
<setting id="SOFTCAM_PLUGIN" value="sc" />
</settings>

View File

@ -38,31 +38,12 @@ if [ ! -f "$ADDON_SETTINGS" ]; then
cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
fi
ENABLE_SOFTCAM=`grep enable_softcam $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
ENABLE_IPTV=`grep enable_iptv $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
ENABLE_STREAMDEV_CLIENT=`grep enable_streamdev_client $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
ENABLE_STREAMDEV_SERVER=`grep enable_streamdev_server $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
ENABLE_WIRBELSCAN=`grep enable_wirbelscan $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
SOFTCAM_PLUGIN=`grep softcam_plugin $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
ENABLE_DYNAMITE=`grep enable_dynamite $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
mkdir -p /var/config
cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf.default
cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf
# workaround for the case when settings.xml is not up-to-date
# happens on update from 2.0.8 or earlier. so we have to get addon defaults
# we may remove this later
[ -z "$ENABLE_SOFTCAM" ] && \
ENABLE_SOFTCAM=`grep enable_softcam $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
[ -z "$ENABLE_IPTV" ] && \
ENABLE_IPTV=`grep enable_iptv $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
[ -z "$ENABLE_STREAMDEV_CLIENT" ] && \
ENABLE_STREAMDEV_CLIENT=`grep enable_streamdev_client $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
[ -z "$ENABLE_STREAMDEV_SERVER" ] && \
ENABLE_STREAMDEV_SERVER=`grep enable_streamdev_server $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
[ -z "$ENABLE_WIRBELSCAN" ] && \
ENABLE_WIRBELSCAN=`grep enable_wirbelscan $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
[ -z "SOFTCAM_PLUGIN" ] && \
SOFTCAM_PLUGIN=`grep softcam_plugin $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
[ -z "$ENABLE_DYNAMITE" ] && \
ENABLE_DYNAMITE=`grep enable_dynamite $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
. /var/config/vdr.conf.default
. /var/config/vdr.conf
VDR_ARG="-g /tmp --no-kbd --log=3 --port=0"
VDR_ARG="$VDR_ARG --config=$ADDON_CONFIG_DIR"

View File

@ -8,13 +8,13 @@
<category label="1001">
<setting label="1030" type="lsep"/>
<setting type="sep" />
<setting id="enable_iptv" type="bool" label="1031" default="false" />
<setting id="enable_streamdev_client" type="bool" label="1032" default="false" />
<setting id="enable_streamdev_server" type="bool" label="1033" default="false" />
<setting id="enable_wirbelscan" type="bool" label="1034" default="true" />
<setting id="enable_dynamite" type="bool" label="1035" default="true" />
<setting id="ENABLE_IPTV" type="bool" label="1031" default="false" />
<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
<setting id="ENABLE_STREAMDEV_SERVER" type="bool" label="1033" default="false" />
<setting id="ENABLE_WIRBELSCAN" type="bool" label="1034" default="true" />
<setting id="ENABLE_DYNAMITE" type="bool" label="1035" default="true" />
<setting type="sep" />
<setting id="enable_softcam" type="bool" label="1036" default="true" />
<setting id="softcam_plugin" type="enum" label="1037" values="sc" enable="!eq(-1,false)" default="0" />
<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />
<setting id="SOFTCAM_PLUGIN" type="labelenum" label="1037" values="sc|dvbapi" enable="!eq(-1,false)" default="sc" />
</category>
</settings>