Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2013-04-15 19:47:08 +02:00
commit e164f1bc90
6 changed files with 31 additions and 18 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="vdr-plugin-xmltv2vdr"
PKG_VERSION="41b998d"
PKG_VERSION="90c023f6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,3 +1,6 @@
3.0.8
- update to TVHeadend 3.3.521
3.0.7
- update to TVHeadend 3.3.511

View File

@ -19,8 +19,8 @@
################################################################################
PKG_NAME="tvheadend"
PKG_VERSION="3.3.511"
PKG_REV="7"
PKG_VERSION="3.3.521"
PKG_REV="8"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

View File

@ -28,10 +28,13 @@ REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3 }' | sed -e
LOCKFILE="/var/lock/tvheadend.sleep"
ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.tvheadend"
case "$1" in
hibernate|suspend)
if [ "$(pidof tvheadend)" ];then
progress "Shutting down HTS TVHeadend for suspending..."
xbmc-send -a "Notification(tvheadend, Shutting down HTS TVHeadend for suspend..., 5000, $ADDON_DIR/icon.png)"
tvheadend.stop
touch $LOCKFILE
for module in $REMOVE_MODULES ; do
@ -41,11 +44,12 @@ case "$1" in
;;
thaw|resume)
for module in $REMOVE_MODULES ; do
modprobe $module
done
progress "Restarting HTS TVHeadend for wakeup..."
if [ -f "$LOCKFILE" ] ; then
progress "Restarting HTS TVHeadend for wakeup..."
xbmc-send -a "Notification(tvheadend, Restarting HTS TVHeadend for wakeup..., 5000, $ADDON_DIR/icon.png)"
for module in $REMOVE_MODULES ; do
modprobe $module
done
rm -rf "$LOCKFILE"
tvheadend.start
fi

View File

@ -6,7 +6,7 @@
- update to vdr-plugin-streamdev-329129d
- update to vdr-live-0.3.0
- update to vdr-plugin-dvbapi-555272d
- update to vdr-plugin-xmltv2vdr-41b998d
- update to vdr-plugin-xmltv2vdr-90c023f6
- update to vdr-plugin-xvdr-935a294
- update to rotorng-0.3.1
- added dvbsddevice plugin

View File

@ -29,21 +29,27 @@ REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3}' | sed -e
LOCKFILE="/var/lock/vdr.sleep"
ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.vdr-addon"
case "$1" in
hibernate|suspend)
progress "Shutting down vdr for suspending..."
vdr.stop
touch $LOCKFILE
for module in $REMOVE_MODULES ; do
rmmod -w $module
done
if [ "$(pidof vdr.bin)" ];then
progress "Shutting down vdr for suspending..."
xbmc-send -a "Notification(vdr, Shutting down vdr for suspend..., 5000, $ADDON_DIR/icon.png)"
vdr.stop
touch $LOCKFILE
for module in $REMOVE_MODULES ; do
rmmod -w $module
done
fi
;;
thaw|resume)
for module in $REMOVE_MODULES ; do
modprobe $module
done
progress "Restarting vdr for wakeup..."
if [ -f "$LOCKFILE" ] ; then
progress "Restarting vdr for wakeup..."
xbmc-send -a "Notification(vdr, Restarting vdr for wakeup..., 5000, $ADDON_DIR/icon.png)"
for module in $REMOVE_MODULES ; do
modprobe $module
done
rm -rf "$LOCKFILE"
vdr.start
fi