Fix no audio by removing legacy (SDL 1.2) SDL_AUDIODRIVER logic

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 35ce643154553ff53f139592e02fdb35c977475d..433073159b029518f0aea1ab264ba21234426c02 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -348,15 +348,6 @@ case "$cmd" in
                fi
                set -- "darkplaces/darkplaces$client" -xonotic "$@"
 
-               # if pulseaudio is running: USE IT
-               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
-                               fi
-                       fi
-               fi
-
                binary=$1
 
                if [ x"$USE_GDB" = x"yes" ]; then

diff --git a/xonotic-linux-sdl.sh b/xonotic-linux-sdl.sh
index becfe8865106b4ab587b54951db34c4168375114..f96c83f9d0af0ed70632c8e1c517f1a0875c4b13 100755 (executable)
--- a/xonotic-linux-sdl.sh
+++ b/xonotic-linux-sdl.sh
@@ -122,13 +122,4 @@ case "$xserver" in
                ;;
 esac
 
-# if pulseaudio
-if [ -z "$SDL_AUDIODRIVER" ]; 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
-               fi
-       fi
-fi
-
 exec "$@"