fix 6ch channel layout in SDL on Linux (it no longer uses SND_CHANNELLAYOUT_ALSA)
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 27 Mar 2010 13:08:42 +0000 (13:08 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 27 Mar 2010 13:08:42 +0000 (13:08 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10061 d7cf8633-e32d-0410-b094-e92efae38249

snd_sdl.c

index 793fc6a..c88b28c 100644 (file)
--- a/snd_sdl.c
+++ b/snd_sdl.c
@@ -160,16 +160,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 
        snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL);
        if (snd_channellayout.integer == SND_CHANNELLAYOUT_AUTO)
-       {
-               int newlayout;
-
-#ifdef __linux__
-               newlayout = SND_CHANNELLAYOUT_ALSA;
-#else
-               newlayout = SND_CHANNELLAYOUT_STANDARD;
-#endif
-               Cvar_SetValueQuick (&snd_channellayout, newlayout);
-       }
+               Cvar_SetValueQuick (&snd_channellayout, SND_CHANNELLAYOUT_STANDARD);
 
        sdlaudiotime = 0;
        SDL_PauseAudio( false );