From: Merlijn Hofstra Date: Sun, 6 Jun 2010 14:07:50 +0000 (+0200) Subject: OSX does not use pulseaudio X-Git-Tag: xonotic-v0.1.0preview~435 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=ec1cee87d1cebe75fcb7b1ca1d14373f251436ae OSX does not use pulseaudio --- diff --git a/all b/all index b7f40412..ab90d98e 100755 --- a/all +++ b/all @@ -530,7 +530,7 @@ case "$cmd" in set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@" # if pulseaudio is running: USE IT - if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ]; then + if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then if ps -C pulseaudio >/dev/null; then if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then export SDL_AUDIODRIVER=pulse