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