X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_sdl.c;h=583ea1f8b3b00d767f61abab2a2f836bf8f86bf4;hp=793fc6a2554718d995084186ce79a4490a4bf7d0;hb=58ec4585483b36354e814171c95f61d3caf9ffb0;hpb=d39861bfe72a5a9ec8cfbcc83457db58a74b75d9

diff --git a/snd_sdl.c b/snd_sdl.c
index 793fc6a2..583ea1f8 100644
--- a/snd_sdl.c
+++ b/snd_sdl.c
@@ -16,11 +16,11 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#include "quakedef.h"
-
 #include <math.h>
 #include <SDL.h>
 
+#include "quakedef.h"
+
 #include "snd_main.h"
 
 
@@ -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 );