From fb786d4beefb413f1e753a5908743227f45210ed Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Mar 2012 22:11:24 +0200 Subject: [PATCH] vdr-addon: add settings ui for vdr plugin config --- .../multimedia/vdr-addon/config/settings.xml | 9 +++- .../multimedia/vdr-addon/source/bin/vdr.start | 42 +++++++++++++++++-- .../resources/language/English/strings.xml | 9 ++++ .../vdr-addon/source/resources/settings.xml | 12 ++++++ 4 files changed, 67 insertions(+), 5 deletions(-) diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index 6255b07c62..561b2f90f6 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -1,3 +1,10 @@ - + + + + + + + + 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 e78d2a6c84..814b94f750 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -34,15 +34,49 @@ ADDON_CONFIG_DIR="$ADDON_HOME/config" ADDON_PLUGIN_DIR="$ADDON_DIR/plugin" ADDON_VIDEO_DIR="$HOME/videos" +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"` + 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 -P xvdr -P sc -P wirbelscan" -VDR_ARG="$VDR_ARG -P dynamite" +VDR_ARG="$VDR_ARG -P xvdr" -if [ ! -f "$ADDON_SETTINGS" ]; then - cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS +if [ "$ENABLE_SOFTCAM" == "true" ] ; then + case "$SOFTCAM_PLUGIN" in + 0) + VDR_ARG="$VDR_ARG -P sc" + ;; + 1) + VDR_ARG="$VDR_ARG -P dvbapi" + ;; + esac +fi +if [ "$ENABLE_IPTV" == "true" ] ; then + VDR_ARG="$VDR_ARG -P iptv" +fi +if [ "$ENABLE_STREAMDEV_SERVER" == "true" ] ; then + VDR_ARG="$VDR_ARG -P streamdev-server" +fi +if [ "$ENABLE_STREAMDEV_CLIENT" == "true" ] ; then + VDR_ARG="$VDR_ARG -P streamdev-client" +fi +if [ "$ENABLE_WIRBELSCAN" == "true" ] ; then + VDR_ARG="$VDR_ARG -P wirbelscan" +fi +# dynamite must be LAST loaded plugin +if [ "$ENABLE_DYNAMITE" == "true" ] ; then + VDR_ARG="$VDR_ARG -P dynamite" fi ( 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 ea3488b9a1..54b9fe5b35 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 @@ -1,6 +1,15 @@ DVB + Plugins DVB Configuration Unload DVB mudules before suspend + Plugin Configuration + Enable plugin: iptv + Enable plugin: streamdev-client + Enable plugin: streamdev-server + Enable plugin: wirbelscan + Enable plugin: dynamite + Enable softcam + softcam plugin 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 6fbbc31240..f20563d259 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -5,4 +5,16 @@ + + + + + + + + + + + +