Merge pull request #446 from stefansaraev/pvr-resume-fixes

vdr & tvheadend: suspend/resume fixes
This commit is contained in:
Stephan Raue 2012-04-13 01:44:17 -07:00
commit c7ca6231dc
2 changed files with 16 additions and 2 deletions

View File

@ -26,11 +26,14 @@ ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
ADDON_SETTINGS="$ADDON_HOME/settings.xml" ADDON_SETTINGS="$ADDON_HOME/settings.xml"
REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
LOCKFILE="/var/lock/tvheadend.sleep"
case "$1" in case "$1" in
hibernate|suspend) hibernate|suspend)
if [ "$(pidof tvheadend)" ];then if [ "$(pidof tvheadend)" ];then
progress "Shutting down HTS TVHeadend for suspending..." progress "Shutting down HTS TVHeadend for suspending..."
tvheadend.stop tvheadend.stop
touch $LOCKFILE
for module in $REMOVE_MODULES ; do for module in $REMOVE_MODULES ; do
rmmod -w $module rmmod -w $module
done done
@ -42,7 +45,10 @@ case "$1" in
modprobe $module modprobe $module
done done
progress "Restarting HTS TVHeadend for wakeup..." progress "Restarting HTS TVHeadend for wakeup..."
xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.hts-tvheadend)" & if [ -f "$LOCKFILE" ] ; then
rm -rf "$LOCKFILE"
tvheadend.start
fi
;; ;;
*) exit $NA *) exit $NA
;; ;;

View File

@ -27,10 +27,14 @@ ADDON_CONFIG_DIR="$ADDON_HOME/config"
ADDON_SETTINGS="$ADDON_HOME/settings.xml" ADDON_SETTINGS="$ADDON_HOME/settings.xml"
REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
LOCKFILE="/var/lock/vdr.sleep"
if [ ! "$REMOVE_MODULES" == "" ] ; then if [ ! "$REMOVE_MODULES" == "" ] ; then
case "$1" in case "$1" in
hibernate|suspend) hibernate|suspend)
progress "Shutting down vdr for suspending..."
vdr.stop vdr.stop
touch $LOCKFILE
for module in $REMOVE_MODULES ; do for module in $REMOVE_MODULES ; do
rmmod -w $module rmmod -w $module
done done
@ -39,7 +43,11 @@ if [ ! "$REMOVE_MODULES" == "" ] ; then
for module in $REMOVE_MODULES ; do for module in $REMOVE_MODULES ; do
modprobe $module modprobe $module
done done
xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.vdr-addon)" & progress "Restarting vdr for wakeup..."
if [ -f "$LOCKFILE" ] ; then
rm -rf "$LOCKFILE"
vdr.start
fi
;; ;;
*) exit $NA *) exit $NA
;; ;;