From ef15c901fe0dc90e426cba28192d49ccdeca49c2 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 12 Jun 2013 16:05:21 +0300
Subject: [PATCH] tvheadend: improve suspend/resume

---
 .../addons/service/multimedia/tvheadend/changelog.txt     | 3 +++
 packages/addons/service/multimedia/tvheadend/meta         | 2 +-
 .../multimedia/tvheadend/source/sleep.d/tvheadend.power   | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt
index 10033e2556..67acaa1f2b 100644
--- a/packages/addons/service/multimedia/tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/tvheadend/changelog.txt
@@ -1,3 +1,6 @@
+3.0.11
+- improve suspend/resume
+
 3.0.10
 - fix preloading capmt.so with sundtek
 - added the ability to use a script's stdout as the xmltv source instead of a fixed file or URL
diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/meta
index 45975736c7..6db2ca25f5 100644
--- a/packages/addons/service/multimedia/tvheadend/meta
+++ b/packages/addons/service/multimedia/tvheadend/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="tvheadend"
 PKG_VERSION="3.4"
-PKG_REV="10"
+PKG_REV="11"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
diff --git a/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power b/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power
index 80554f4ed3..7fd90f9d3a 100755
--- a/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power
+++ b/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power
@@ -50,6 +50,14 @@ case "$1" in
       for module in $REMOVE_MODULES ; do
         modprobe $module
       done
+      tvheadend.stop
+      for seq in `seq 1 10` ; do
+        if [ ! "$(pidof tvheadend)" ];then
+          break
+        fi
+        usleep 500000
+      done
+      killall -9 tvheadend &>/dev/null
       rm -rf "$LOCKFILE"
       tvheadend.start
     fi