fix pqrcon rcon_password bug introduced in r9420 (was not

[xonotic/darkplaces.git] / snd_sdl.c

diff --git a/snd_sdl.c b/snd_sdl.c
index 32990af8d3e5c5540daf1275c9c87c912505d4a1..c88b28c8bb3d565fe3677375b23c1247d955edc7 100644 (file)
--- a/snd_sdl.c
+++ b/snd_sdl.c
@@ -73,8 +73,8 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int len)
 
                snd_renderbuffer->startframe += FrameCount;
 
-               if (FrameCount < RequestedFrames && developer.integer >= 1000 && vid_activewindow)
-                       Con_Printf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount);
+               if (FrameCount < RequestedFrames && developer_insane.integer && vid_activewindow)
+                       Con_DPrintf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount);
 
                sdlaudiotime += RequestedFrames;
 
@@ -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 );
@@ -249,3 +240,15 @@ void SndSys_UnlockRenderBuffer (void)
 {
        SDL_UnlockAudio();
 }
+
+/*
+====================
+SndSys_SendKeyEvents
+
+Send keyboard events originating from the sound system (e.g. MIDI)
+====================
+*/
+void SndSys_SendKeyEvents(void)
+{
+       // not supported
+}