Permalink
Browse files

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
  • Loading branch information...
anssih
anssih committed Oct 27, 2010
1 parent 91d112c commit f20b81c73aac088b621323fd52fa0544aac76d8e
View
@@ -139,7 +139,7 @@ INCLUDES=$(sort @INCLUDES@)
CLEAN_FILES=xbmc.bin xbmc-xrandr
DISTCLEAN_FILES=config.h config.log config.status tools/Linux/xbmc.sh \
- autom4te.cache config.h.in~ \
+ tools/Linux/xbmc-standalone.sh autom4te.cache config.h.in~ \
xbmc/lib/libPython/Python/Include/pyconfig.h \
xbmc/lib/libPython/Python/configure.lineno \
xbmc/lib/libPython/Python/libpython2.4.so.1.0 \
View
@@ -1223,8 +1223,10 @@ else
fi
if test "x$use_pulse" != "xno"; then
+ XBMC_STANDALONE_SH_PULSE=tools/Linux/xbmc-standalone.sh.pulse
final_message="$final_message\n PulseAudio:\tYes"
else
+ XBMC_STANDALONE_SH_PULSE=/dev/null
final_message="$final_message\n PulseAudio:\tNo"
fi
@@ -1426,6 +1428,7 @@ OUTPUT_FILES="Makefile \
xbmc/visualizations/iTunes/Makefile \
xbmc/FileSystem/Makefile \
tools/Linux/xbmc.sh \
+ tools/Linux/xbmc-standalone.sh \
tools/TexturePacker/Makefile \
tools/EventClients/Clients/OSXRemote/Makefile"
@@ -1482,6 +1485,7 @@ AC_SUBST(LIBMAD_BASENAME)
AC_SUBST(LIBOGG_BASENAME)
AC_SUBST(LIBVORBISENC_BASENAME)
AC_SUBST(LIBVORBIS_BASENAME)
+AC_SUBST_FILE(XBMC_STANDALONE_SH_PULSE)
# pushd and popd are not available in other shells besides bash, so implement
# our own pushd/popd functions
@@ -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
@@ -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

0 comments on commit f20b81c

Please sign in to comment.