projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fdc1b70
)
fix useless warning on pulseaudio check on Windows :P
author
Rudolf Polzer <divverent@alientrap.org>
Thu, 20 May 2010 07:30:32 +0000
(09:30 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Thu, 20 May 2010 07:30:32 +0000
(09:30 +0200)
all
patch
|
blob
|
history
diff --git
a/all
b/all
index 80b78de396a55febc1080e6a09af8b22472b9367..935a58ae0c8327034a5b39b25b736688c4f65913 100755
(executable)
--- a/
all
+++ b/
all
@@
-522,9
+522,11
@@
case "$cmd" in
set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
# if pulseaudio is running: USE IT
set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
# if pulseaudio is running: USE IT
- 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
+ if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ]; 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
fi
fi