diff options
| author | anssih <anssih@svn> | 2010-10-27 16:48:48 +0000 |
|---|---|---|
| committer | anssih <anssih@svn> | 2010-10-27 16:48:48 +0000 |
| commit | f20b81c73aac088b621323fd52fa0544aac76d8e (patch) | |
| tree | 99594a1df80e3bcd976abb52ed02263009d799f0 /tools/Linux | |
| parent | 91d112ccba5be5e895a74aed75399ffebfcece0e (diff) | |
fixed: do not try to start pulse if --disable-pulse was used
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@35032 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'tools/Linux')
| -rwxr-xr-x | tools/Linux/xbmc-standalone.sh.in (renamed from tools/Linux/xbmc-standalone.sh) | 10 | ||||
| -rw-r--r-- | tools/Linux/xbmc-standalone.sh.pulse | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/tools/Linux/xbmc-standalone.sh b/tools/Linux/xbmc-standalone.sh.in index 422d413d1a..188aad59aa 100755 --- a/tools/Linux/xbmc-standalone.sh +++ b/tools/Linux/xbmc-standalone.sh.in @@ -20,15 +20,7 @@ XBMC="xbmc --standalone \"$@\"" -PULSE_START="$(which start-pulseaudio-x11)" -if [ -n "$PULSE_START" ]; then - $PULSE_START -else - PULSE_SESSION="$(which pulse-session)" - if [ -n "$PULSE_SESSION" ]; then - XBMC="$PULSE_SESSION $XBMC" - fi -fi +@XBMC_STANDALONE_SH_PULSE@ LOOP=1 CRASHCOUNT=0 diff --git a/tools/Linux/xbmc-standalone.sh.pulse b/tools/Linux/xbmc-standalone.sh.pulse new file mode 100644 index 0000000000..c4d5564344 --- /dev/null +++ b/tools/Linux/xbmc-standalone.sh.pulse @@ -0,0 +1,9 @@ +PULSE_START="$(which start-pulseaudio-x11)" +if [ -n "$PULSE_START" ]; then + $PULSE_START +else + PULSE_SESSION="$(which pulse-session)" + if [ -n "$PULSE_SESSION" ]; then + XBMC="$PULSE_SESSION $XBMC" + fi +fi |