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 | |
| 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
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -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 |
4 files changed, 15 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index ffdfbc71a2..af151f4c5b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 \ diff --git a/configure.in b/configure.in index 4baa022fe9..52b2047879 100644 --- a/configure.in +++ b/configure.in @@ -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 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 |