From 5d6814fb147c39731abaed6ced7644d78d80e1ff Mon Sep 17 00:00:00 2001 From: =?utf8?q?Amadeusz=20S=C5=82awi=C5=84ski?= Date: Fri, 8 Apr 2022 18:29:18 +0000 Subject: [PATCH] Fix no audio by removing legacy (SDL 1.2) SDL_AUDIODRIVER logic --- misc/tools/all/xonotic.subr | 9 --------- xonotic-linux-sdl.sh | 9 --------- 2 files changed, 18 deletions(-) diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr index 35ce6431..43307315 100644 --- 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 becfe886..f96c83f9 100755 --- 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 "$@" -- 2.39.2