From 64c96a38e53eac4664f2c48f0e40fdd052157621 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 11 Mar 2012 12:27:28 +0200
Subject: [PATCH 1/3] tvheadend: tvheadend.power: fix sleep & resume

---
 .../source/sleep.d/tvheadend.power            | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power
index 1fc9b6f083..70d90fa961 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power
@@ -26,28 +26,27 @@ ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 
-case "$1" in
-  hibernate|suspend)
-    if [ "$(pidof tvheadend)" ];then
-      progress "Shutting down HTS TVHeadend for suspending..."
-      tvheadend.stop
-      for module in $REMOVE_MODULES ; do
-        rmmod -w $module
-      done      
-    fi
-    ;;
+if [ ! "$REMOVE_MODULES" == "" ] ; then
+  case "$1" in
+    hibernate|suspend)
+      if [ "$(pidof tvheadend)" ];then
+        progress "Shutting down HTS TVHeadend for suspending..."
+        tvheadend.stop
+        for module in $REMOVE_MODULES ; do
+          rmmod -w $module
+        done
+      fi
+      ;;
 
-  thaw|resume)
-    if [ -f "$LOCKDIR/$LOCKFILE" ];then
+    thaw|resume)
       for module in $REMOVE_MODULES ; do
         modprobe $module
       done
       progress "Restarting HTS TVHeadend for wakeup..."
       xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.hts-tvheadend)" &
-    fi
-    ;;
-
-  *) exit $NA
-    ;;
-esac
+      ;;
 
+    *) exit $NA
+      ;;
+  esac
+fi

From 1d45f8ff7acb057778bc198247c607bf8c286ca2 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 11 Mar 2012 19:33:59 +0200
Subject: [PATCH 2/3] tvheadend: remove 'sleep' from tvheadend.start

---
 .../service/multimedia/hts-tvheadend/source/bin/tvheadend.start  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
index 2028c5246f..738ed00780 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
@@ -64,6 +64,5 @@ mkdir -p $ADDON_HOME
         break
       fi
       $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
-      sleep 1
     done &
   fi

From bda6e3d7d206a8cb7eb264b4bd78f009028ee353 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 11 Mar 2012 19:43:49 +0200
Subject: [PATCH 3/3] tvheadend: revert REMOVE_MODULES sleep/resume logic

---
 .../source/sleep.d/tvheadend.power            | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power
index 70d90fa961..b076ca9e9c 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power
@@ -26,27 +26,24 @@ ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 
-if [ ! "$REMOVE_MODULES" == "" ] ; then
-  case "$1" in
-    hibernate|suspend)
-      if [ "$(pidof tvheadend)" ];then
-        progress "Shutting down HTS TVHeadend for suspending..."
-        tvheadend.stop
-        for module in $REMOVE_MODULES ; do
-          rmmod -w $module
-        done
-      fi
-      ;;
-
-    thaw|resume)
+case "$1" in
+  hibernate|suspend)
+    if [ "$(pidof tvheadend)" ];then
+      progress "Shutting down HTS TVHeadend for suspending..."
+      tvheadend.stop
       for module in $REMOVE_MODULES ; do
-        modprobe $module
+        rmmod -w $module
       done
-      progress "Restarting HTS TVHeadend for wakeup..."
-      xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.hts-tvheadend)" &
-      ;;
+    fi
+    ;;
 
-    *) exit $NA
-      ;;
-  esac
-fi
+  thaw|resume)
+    for module in $REMOVE_MODULES ; do
+      modprobe $module
+    done
+    progress "Restarting HTS TVHeadend for wakeup..."
+    xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.hts-tvheadend)" &
+    ;;
+  *) exit $NA
+    ;;
+esac