Skip to content

Commit

Permalink
fixed: pulseaudio started on non-pulse systems by standalone mode
Browse files Browse the repository at this point in the history
Fix a regression of r34013 in which pulseaudio was started on systems
with pulseaudio disabled when running the standalone mode script. See
ticket xbmc#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.

(cherry picked from commit a92376345214c4bd3a2e25bbf08b87e6c96b2c56)

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@35025 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information
anssih committed Oct 26, 2010
1 parent b62b1ae commit f30cf80
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions tools/Linux/xbmc-standalone.sh
Expand Up @@ -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)
Expand Down

0 comments on commit f30cf80

Please sign in to comment.