From ee7fff31b8fa49a89b639a2ded29222bc406f589 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 4 Sep 2010 04:18:13 +0200 Subject: [PATCH] xbmc-dharma: split init script in setup and run part, add some more default options (folders), use vblank option only on nvidia and ati graphics, because of problems with intel graphic Signed-off-by: Stephan Raue --- .../xbmc-dharma/init.d/60_setup-xbmc | 126 ++++++++++++++++++ .../xbmc-dharma/init.d/{60_xbmc => 61_xbmc} | 26 ---- 2 files changed, 126 insertions(+), 26 deletions(-) create mode 100755 packages/mediacenter/xbmc-dharma/init.d/60_setup-xbmc rename packages/mediacenter/xbmc-dharma/init.d/{60_xbmc => 61_xbmc} (73%) diff --git a/packages/mediacenter/xbmc-dharma/init.d/60_setup-xbmc b/packages/mediacenter/xbmc-dharma/init.d/60_setup-xbmc new file mode 100755 index 0000000000..3a060408eb --- /dev/null +++ b/packages/mediacenter/xbmc-dharma/init.d/60_setup-xbmc @@ -0,0 +1,126 @@ +#!/bin/sh + +################################################################################ +# Copyright (C) 2009-2010 OpenELEC.tv +# http://www.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 +################################################################################ + +# setup XBMC +# +# runlevels: openelec + +. /etc/profile + +progress "setup XBMC" + +nvidiaGpuType=$(lspci -nn | grep 'VGA' | grep 'nVidia Corporation') +amdGpuType=$(lspci -nn | grep 'VGA' | grep 1002) + +# +# clean temp dir +# + rm -rf $HOME/.xbmc/temp/* + +# +# add some default settings +# + mkdir -p $HOME/.xbmc/userdata + +# use dds fanarts by default + if [ ! -f $HOME/.xbmc/userdata/advancedsettings.xml ] ; then + cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF + + true + +EOF + fi + +# +# setup directories for XBMC sources +# + + [ ! -d "$HOME/music" ] && mkdir -p $HOME/music + [ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures + [ ! -d "$HOME/tvshows" ] && mkdir -p $HOME/tvshows + [ ! -d "$HOME/videos" ] && mkdir -p $HOME/videos + + mkdir -p $HOME/.xbmc/userdata + + if [ ! -f $HOME/.xbmc/userdata/sources.xml ] ; then + cat > $HOME/.xbmc/userdata/sources.xml << EOF + + + + + + Music + $HOME/music/ + + + + + + Pictures + $HOME/pictures/ + + + +EOF + fi + +# +# common setup guisettings for amd and nvidia graphic +# + + mkdir -p $HOME/.xbmc/userdata + + [ ! -d "$HOME/screenshots" ] && mkdir -p $HOME/screenshots + + if [ ! -f $HOME/.xbmc/userdata/guisettings.xml ] ; then + echo "" > $HOME/.xbmc/userdata/guisettings.xml + + cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF + + $HOME/screenshots/ + +EOF + +# +# common setup for amd and nvidia graphic +# + + # Always sync to vblank + if [ -n "$amdGpuType" -o -n "$nvidiaGpuType" ] ; then + cat >> $HOME/.xbmc/userdata/guisettings.xml << EOF + + 2 + +EOF + fi + echo "" >> $HOME/.xbmc/userdata/guisettings.xml + fi diff --git a/packages/mediacenter/xbmc-dharma/init.d/60_xbmc b/packages/mediacenter/xbmc-dharma/init.d/61_xbmc similarity index 73% rename from packages/mediacenter/xbmc-dharma/init.d/60_xbmc rename to packages/mediacenter/xbmc-dharma/init.d/61_xbmc index 60b75e70a0..e53a7b52cb 100755 --- a/packages/mediacenter/xbmc-dharma/init.d/60_xbmc +++ b/packages/mediacenter/xbmc-dharma/init.d/61_xbmc @@ -30,32 +30,6 @@ progress "starting XBMC" XBMC_ARGS="--standalone -fs --lircdev /dev/lircd" -# clean temp dir - rm -rf $HOME/.xbmc/temp/* - -# add some default settings - mkdir -p $HOME/.xbmc/userdata - # use dds fanarts by default - if [ ! -f $HOME/.xbmc/userdata/advancedsettings.xml ] ; then - cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF - - true - -EOF - fi - - mkdir -p $HOME/.xbmc/userdata - # Always sync to vblank - if [ ! -f $HOME/.xbmc/userdata/guisettings.xml ] ; then - cat > $HOME/.xbmc/userdata/guisettings.xml << EOF - - - 2 - - -EOF - fi - # starting pulseaudio if avaible [ -f /usr/bin/pulseaudio ] && /usr/bin/pulseaudio \ --start --log-target=syslog --daemonize 2>&1 > /dev/null