From 77cfb80df87dfcc493aa5732b360ee31314e1c95 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Mar 2012 20:47:17 +0200 Subject: [PATCH 1/8] vdr-addon: moved REMOVE_MODULES to addon config --- .../addons/service/multimedia/vdr-addon/addon | 1 - .../vdr-addon/config/vdr-sleep.conf | 6 --- .../resources/language/English/strings.xml | 6 +++ .../vdr-addon/source/resources/settings.xml | 8 ++++ .../vdr-addon/source/sleep.d/modules.power | 40 +++++++++---------- 5 files changed, 33 insertions(+), 28 deletions(-) delete mode 100644 packages/addons/service/multimedia/vdr-addon/config/vdr-sleep.conf create mode 100644 packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml create mode 100644 packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon index 66592a7860..04f5199ca2 100755 --- a/packages/addons/service/multimedia/vdr-addon/addon +++ b/packages/addons/service/multimedia/vdr-addon/addon @@ -33,7 +33,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config cp $BUILD/vdr-[0-9]*/sources.conf $ADDON_BUILD/$PKG_ADDON_ID/config cp $BUILD/vdr-[0-9]*/svdrphosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config echo '0.0.0.0/0' >> $ADDON_BUILD/$PKG_ADDON_ID/config/svdrphosts.conf - cp -PR $PKG_DIR/config/vdr-sleep.conf $ADDON_BUILD/$PKG_ADDON_ID/config mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-xvdr-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin diff --git a/packages/addons/service/multimedia/vdr-addon/config/vdr-sleep.conf b/packages/addons/service/multimedia/vdr-addon/config/vdr-sleep.conf deleted file mode 100644 index 91b5c064f5..0000000000 --- a/packages/addons/service/multimedia/vdr-addon/config/vdr-sleep.conf +++ /dev/null @@ -1,6 +0,0 @@ -# space-separated list of modules to remove on suspend -# and load on resume -# example: -# REMOVE_MODULES="cx23885 mantis" - -REMOVE_MODULES="" 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 new file mode 100644 index 0000000000..ea3488b9a1 --- /dev/null +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml @@ -0,0 +1,6 @@ + + + DVB + DVB Configuration + Unload DVB mudules before suspend + diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml new file mode 100644 index 0000000000..6fbbc31240 --- /dev/null +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power index 8a4d80b8d2..2d44b7a858 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power +++ b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power @@ -24,26 +24,24 @@ ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.vdr-addon" ADDON_CONFIG_DIR="$ADDON_HOME/config" +ADDON_SETTINGS="$ADDON_HOME/settings.xml" +REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` -if [ -f "$ADDON_CONFIG_DIR/vdr-sleep.conf" ]; then - . "$ADDON_CONFIG_DIR/vdr-sleep.conf" - - if [ ! "$REMOVE_MODULES" == "" ] ; then - case "$1" in - hibernate|suspend) - vdr.stop - for module in $REMOVE_MODULES ; do - rmmod -w $module - done - ;; - thaw|resume) - for module in $REMOVE_MODULES ; do - modprobe $module - done - xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.vdr-addon)" & - ;; - *) exit $NA - ;; - esac - fi +if [ ! "$REMOVE_MODULES" == "" ] ; then + case "$1" in + hibernate|suspend) + vdr.stop + for module in $REMOVE_MODULES ; do + rmmod -w $module + done + ;; + thaw|resume) + for module in $REMOVE_MODULES ; do + modprobe $module + done + xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.vdr-addon)" & + ;; + *) exit $NA + ;; + esac fi From fb786d4beefb413f1e753a5908743227f45210ed Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Mar 2012 22:11:24 +0200 Subject: [PATCH 2/8] 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 @@ + + + + + + + + + + + + From 11ee01030f4c84fceba452766358c12963ff744c Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Mar 2012 22:48:50 +0200 Subject: [PATCH 3/8] vdr-addon: workaround for the case when settings.xml is not up-to-date --- .../multimedia/vdr-addon/source/bin/vdr.start | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 814b94f750..a79a497933 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -46,6 +46,24 @@ ENABLE_WIRBELSCAN=`grep enable_wirbelscan $ADDON_SETTINGS | awk '{print $3}' | s 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"` +# 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 "$ENABLE_WIRBELSCAN" ] && \ + 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"` + 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" From a9e215b47ba1557da77188df0ed879300ef133f8 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Mar 2012 22:50:24 +0200 Subject: [PATCH 4/8] vdr-addon: bump version --- packages/addons/service/multimedia/vdr-addon/changelog.txt | 4 ++++ packages/addons/service/multimedia/vdr-addon/meta | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt index 5703739e01..007fd36d2b 100644 --- a/packages/addons/service/multimedia/vdr-addon/changelog.txt +++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt @@ -1,3 +1,7 @@ +2.0.9 +- modules to remove on sleep now configurable via settings ui +- enabled plugins now configurable via settings ui + 2.0.8 - update to vdr-1.7.25 - update to vdr-plugin-xvdr-c98852f diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta index 5a1a84a293..64fdf7b912 100755 --- a/packages/addons/service/multimedia/vdr-addon/meta +++ b/packages/addons/service/multimedia/vdr-addon/meta @@ -21,7 +21,7 @@ PKG_NAME="vdr-addon" PKG_VERSION="2.0" -PKG_REV="8" +PKG_REV="9" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" From e05defd28c0fbba1df8fe6ce1f7cc06371e2240f Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Mar 2012 22:55:28 +0200 Subject: [PATCH 5/8] packages/3rdparty/multimedia/vdr-iptv/rename: chmod to 755 --- packages/3rdparty/multimedia/vdr-iptv/rename | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 packages/3rdparty/multimedia/vdr-iptv/rename diff --git a/packages/3rdparty/multimedia/vdr-iptv/rename b/packages/3rdparty/multimedia/vdr-iptv/rename old mode 100644 new mode 100755 From ce2be684a0c22a3d9853e1d102c4a9c354ad04a8 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Mar 2012 23:40:00 +0200 Subject: [PATCH 6/8] vdr-addon: vdr.start: fix softcam logic --- .../service/multimedia/vdr-addon/config/settings.xml | 2 +- .../service/multimedia/vdr-addon/source/bin/vdr.start | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index 561b2f90f6..7cd93246a1 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -6,5 +6,5 @@ - + 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 a79a497933..6bdc56876b 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -59,7 +59,7 @@ ENABLE_DYNAMITE=`grep enable_dynamite $ADDON_SETTINGS | awk '{print $3}' | sed - 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 "$ENABLE_WIRBELSCAN" ] && \ +[ -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"` @@ -71,14 +71,7 @@ VDR_ARG="$VDR_ARG --video=$ADDON_VIDEO_DIR" VDR_ARG="$VDR_ARG -P xvdr" if [ "$ENABLE_SOFTCAM" == "true" ] ; then - case "$SOFTCAM_PLUGIN" in - 0) - VDR_ARG="$VDR_ARG -P sc" - ;; - 1) - VDR_ARG="$VDR_ARG -P dvbapi" - ;; - esac + VDR_ARG="$VDR_ARG -P $SOFTCAM_PLUGIN" fi if [ "$ENABLE_IPTV" == "true" ] ; then VDR_ARG="$VDR_ARG -P iptv" From d4ce3187f852f0432892edc06a77f6fb8c90f388 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 9 Mar 2012 00:04:49 +0200 Subject: [PATCH 7/8] vdr-addon: config & startup enhancements --- .../multimedia/vdr-addon/config/settings.xml | 14 ++++----- .../multimedia/vdr-addon/source/bin/vdr.start | 29 ++++--------------- .../vdr-addon/source/resources/settings.xml | 14 ++++----- 3 files changed, 19 insertions(+), 38 deletions(-) diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index 7cd93246a1..7898be9965 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -1,10 +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 6bdc56876b..ea82c9645d 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -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" 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 f20563d259..0f406def81 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -8,13 +8,13 @@ - - - - - + + + + + - - + + From 9b41f2296402ef891e3488934d4c1e0459ca420b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 9 Mar 2012 00:10:41 +0200 Subject: [PATCH 8/8] vdr-addon: remove dvbapi from sc list --- .../service/multimedia/vdr-addon/source/resources/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0f406def81..db8a2945c1 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -15,6 +15,6 @@ - +