diff --git a/packages/mediacenter/xbmc-pvr/init.d/93_xbmc b/packages/mediacenter/xbmc-pvr/init.d/93_xbmc index aeb0a615c8..9fe80e19c8 100644 --- a/packages/mediacenter/xbmc-pvr/init.d/93_xbmc +++ b/packages/mediacenter/xbmc-pvr/init.d/93_xbmc @@ -28,6 +28,21 @@ XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV" progress "starting XBMC" +# hack for Boxee Remote +if $(cat /proc/bus/input/devices | grep Vendor=0471 | grep -q Product=20d9);then + export SDL_MOUSE_RELATIVE=0 +fi + +# starting autostart script (will be removed later again, dont use it!!!) + AUTOSTART="/storage/.config/autostart.sh" + if [ -f $AUTOSTART ]; then + echo "!!! AUTOSTART script detected !!!" >> /var/log/messages + cat "$AUTOSTART" >> /var/log/messages + echo "!!! -End of autostart script- !!!" >> /var/log/messages + + sh $AUTOSTART + fi + # starting autoupdate [ -f /usr/bin/autoupdate ] && /usr/bin/autoupdate & diff --git a/packages/mediacenter/xbmc-pvr/scripts/cputemp b/packages/mediacenter/xbmc-pvr/scripts/cputemp index 4e5d1a0721..51a9292ab0 100755 --- a/packages/mediacenter/xbmc-pvr/scripts/cputemp +++ b/packages/mediacenter/xbmc-pvr/scripts/cputemp @@ -22,11 +22,8 @@ TEMP="0" -if [ -f /sys/class/thermal/thermal_zone0/temp ]; then - TEMP=`echo "$(cat /sys/class/thermal/thermal_zone0/temp)/1000" |bc` -elif [ -f /usr/bin/sensors ]; then -# TEMP=`/usr/bin/sensors -u | head -6 |grep "temp1_input"| awk '{print $2 }' |awk '{printf("%d\n",$1 + 0.5);}'` - TEMP=`/usr/bin/sensors -u | tail -n4 | grep temp1_input | awk '{print $2 }' |awk '{printf("%d\n",$1 + 0.5);}'` +if [ -f /usr/bin/sensors ]; then + TEMP=`/usr/bin/sensors -u | tail -n6 | grep temp1_input | awk '{print $2 }' |awk '{printf("%d\n",$1 + 0.5);}'` fi echo "${TEMP} C" diff --git a/packages/mediacenter/xbmc-pvr/scripts/gputemp b/packages/mediacenter/xbmc-pvr/scripts/gputemp index accc4f023a..3c39bc5f73 100755 --- a/packages/mediacenter/xbmc-pvr/scripts/gputemp +++ b/packages/mediacenter/xbmc-pvr/scripts/gputemp @@ -23,7 +23,7 @@ TEMP="0" if lspci -n | grep 0300 | grep -q 10de; then - [ -f /usr/bin/nvidia-smi ] && TEMP=`/usr/bin/nvidia-smi -a | grep 'Temperature' | awk '{print $3}'` + [ -f /usr/bin/nvidia-smi ] && TEMP=`/usr/bin/nvidia-smi -q -x | grep 'gpu_temp' | awk '{ print $1 }' | sed 's,,,g'` fi echo "${TEMP} C" diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/01_update_videodb b/packages/mediacenter/xbmc-pvr/sleep.d/01_update_videodb index ee72bfee67..7b509b0c12 100755 --- a/packages/mediacenter/xbmc-pvr/sleep.d/01_update_videodb +++ b/packages/mediacenter/xbmc-pvr/sleep.d/01_update_videodb @@ -22,14 +22,13 @@ . /etc/profile -OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" - case "$1" in thaw|resume) ( - if [ -f "$OPENELEC_SETTINGS" ]; then - VIDEODBUPDATE=`grep WAKEUP_VIDEODBUPDATE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` - if [ "$VIDEODBUPDATE" = "true" ]; then + if [ -f /var/config/settings.conf ]; then + . /var/config/settings.conf + + if [ "$WAKEUP_VIDEODBUPDATE" = "true" ]; then usleep 5000000 xbmc-send --host=127.0.0.1 -a "UpdateLibrary(video)" fi diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/02_update_musicdb b/packages/mediacenter/xbmc-pvr/sleep.d/02_update_musicdb index 7abc8c90da..22ab151a7b 100755 --- a/packages/mediacenter/xbmc-pvr/sleep.d/02_update_musicdb +++ b/packages/mediacenter/xbmc-pvr/sleep.d/02_update_musicdb @@ -22,14 +22,13 @@ . /etc/profile -OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" - case "$1" in thaw|resume) ( - if [ -f "$OPENELEC_SETTINGS" ]; then - MUSICDBUPDATE=`grep WAKEUP_MUSICDBUPDATE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` - if [ "$MUSICDBUPDATE" = "true" ]; then + if [ -f /var/config/settings.conf ]; then + . /var/config/settings.conf + + if [ "$WAKEUP_MUSICDBUPDATE" = "true" ]; then usleep 5000000 xbmc-send --host=127.0.0.1 -a "UpdateLibrary(music)" fi diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/61_xbmc_lirc b/packages/mediacenter/xbmc-pvr/sleep.d/61_xbmc_lirc new file mode 100755 index 0000000000..6df3ad6b31 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/sleep.d/61_xbmc_lirc @@ -0,0 +1,34 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. /etc/profile + +case "$1" in + hibernate|suspend) + xbmc-send --host=127.0.0.1 -a "LIRC.Stop" + ;; + thaw|resume) + xbmc-send --host=127.0.0.1 -a "LIRC.Start" + ;; + *) exit $NA + ;; +esac diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/62_xbmc_lcd b/packages/mediacenter/xbmc-pvr/sleep.d/62_xbmc_lcd new file mode 100755 index 0000000000..7b93b3c3a3 --- /dev/null +++ b/packages/mediacenter/xbmc-pvr/sleep.d/62_xbmc_lcd @@ -0,0 +1,34 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. /etc/profile + +case "$1" in + hibernate|suspend) + xbmc-send --host=127.0.0.1 -a "LCD.Suspend" + ;; + thaw|resume) + xbmc-send --host=127.0.0.1 -a "LCD.Resume" + ;; + *) exit $NA + ;; +esac diff --git a/packages/mediacenter/xbmc-pvr/splash/splash.png b/packages/mediacenter/xbmc-pvr/splash/splash.png index 7a4fe389f0..6b2897b0a1 100644 Binary files a/packages/mediacenter/xbmc-pvr/splash/splash.png and b/packages/mediacenter/xbmc-pvr/splash/splash.png differ diff --git a/packages/mediacenter/xbmc-pvr/splash/splash1.png b/packages/mediacenter/xbmc-pvr/splash/splash1.png index 8c86ae06a7..ac0aa0052f 100644 Binary files a/packages/mediacenter/xbmc-pvr/splash/splash1.png and b/packages/mediacenter/xbmc-pvr/splash/splash1.png differ diff --git a/packages/mediacenter/xbmc-pvr/splash/splash2.png b/packages/mediacenter/xbmc-pvr/splash/splash2.png deleted file mode 100644 index 1db8fc8ccd..0000000000 Binary files a/packages/mediacenter/xbmc-pvr/splash/splash2.png and /dev/null differ diff --git a/packages/mediacenter/xbmc-pvr/splash/splash3.png b/packages/mediacenter/xbmc-pvr/splash/splash3.png deleted file mode 100644 index cc3bb90a5a..0000000000 Binary files a/packages/mediacenter/xbmc-pvr/splash/splash3.png and /dev/null differ diff --git a/packages/mediacenter/xbmc-pvr/splash/splash4.png b/packages/mediacenter/xbmc-pvr/splash/splash4.png deleted file mode 100644 index 62590dfd6e..0000000000 Binary files a/packages/mediacenter/xbmc-pvr/splash/splash4.png and /dev/null differ