X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=snd_sdl.c;h=583ea1f8b3b00d767f61abab2a2f836bf8f86bf4;hb=9ac6f1395459b9ab4093f690365ce1e3d62d0577;hp=32990af8d3e5c5540daf1275c9c87c912505d4a1;hpb=6fbf3c40550fb9524b6a58e62ea47afaf63bc97b;p=xonotic%2Fdarkplaces.git

diff --git a/snd_sdl.c b/snd_sdl.c
index 32990af8..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"
 
 
@@ -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
+}