diff options
| author | anssih <anssih@svn> | 2010-10-26 19:30:31 +0000 |
|---|---|---|
| committer | anssih <anssih@svn> | 2010-10-26 19:30:31 +0000 |
| commit | 5f474694380952f2ea3a76bed4c8f2eadb5a0eb9 (patch) | |
| tree | 9e7760ca3948057efe635d0748ffca1f051f4173 /tools/Linux | |
| parent | f33fc3ad17cabbd86e0fdd4b7890e84c5b3a3552 (diff) | |
fixed: pulseaudio started on non-pulse systems by standalone mode
Fix a regression of r34013 in which pulseaudio was started on systems
with pulseaudio disabled when running the standalone mode script. See
ticket #9247 for details.
This is done by switching to use start-pulseaudio-x11 with pulse-session
as fallback (the latter was used before r34013) instead of pulseaudio
directly.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@35024 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'tools/Linux')
| -rwxr-xr-x | tools/Linux/xbmc-standalone.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tools/Linux/xbmc-standalone.sh b/tools/Linux/xbmc-standalone.sh index 04459e114c..422d413d1a 100755 --- a/tools/Linux/xbmc-standalone.sh +++ b/tools/Linux/xbmc-standalone.sh @@ -18,13 +18,18 @@ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. # http://www.gnu.org/copyleft/gpl.html -PULSE=$(which pulseaudio) -if [ ! -z "$PULSE" ]; then - $PULSE --start -fi - 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 + LOOP=1 CRASHCOUNT=0 LASTSUCCESSFULSTART=$(date +%s) |