OSX does not use pulseaudio
authorMerlijn Hofstra <merlijnhofstra@mh.local>
Sun, 6 Jun 2010 14:07:50 +0000 (16:07 +0200)
committerMerlijn Hofstra <merlijnhofstra@mh.local>
Sun, 6 Jun 2010 14:07:50 +0000 (16:07 +0200)
all

diff --git a/all b/all
index b7f404122d551fa9c489129af5ffd3617ffb5fcd..ab90d98ef394569ffa6d50fe07b4d397db8e3cca 100755 (executable)
--- 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