X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=snd_sdl.c;h=c88b28c8bb3d565fe3677375b23c1247d955edc7;hb=6d89dcbc6b8565b1ee3cb7ec63213efde6c7d988;hp=dae644de4c4220e3ab609cc732ce265c0847a0ca;hpb=a334e97bd7b1e7b37fe40a96caf9ccb8504c3f96;p=xonotic%2Fdarkplaces.git

diff --git a/snd_sdl.c b/snd_sdl.c
index dae644de..c88b28c8 100644
--- a/snd_sdl.c
+++ b/snd_sdl.c
@@ -39,41 +39,47 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int len)
 
 	RequestedFrames = (unsigned int)len / factor;
 
-	if (snd_usethreadedmixing)
+	if (SndSys_LockRenderBuffer())
 	{
-		S_MixToBuffer(stream, RequestedFrames);
-		if (snd_blocked)
-			memset(stream, snd_renderbuffer->format.width == 1 ? 0x80 : 0, len);
-		return;
-	}
+		if (snd_usethreadedmixing)
+		{
+			S_MixToBuffer(stream, RequestedFrames);
+			if (snd_blocked)
+				memset(stream, snd_renderbuffer->format.width == 1 ? 0x80 : 0, len);
+			SndSys_UnlockRenderBuffer();
+			return;
+		}
 
-	// Transfert up to a chunk of samples from snd_renderbuffer to stream
-	MaxFrames = snd_renderbuffer->endframe - snd_renderbuffer->startframe;
-	if (MaxFrames > RequestedFrames)
-		FrameCount = RequestedFrames;
-	else
-		FrameCount = MaxFrames;
-	StartOffset = snd_renderbuffer->startframe % snd_renderbuffer->maxframes;
-	EndOffset = (snd_renderbuffer->startframe + FrameCount) % snd_renderbuffer->maxframes;
-	if (StartOffset > EndOffset)  // if the buffer wraps
-	{
-		unsigned int PartialLength1, PartialLength2;
+		// Transfert up to a chunk of samples from snd_renderbuffer to stream
+		MaxFrames = snd_renderbuffer->endframe - snd_renderbuffer->startframe;
+		if (MaxFrames > RequestedFrames)
+			FrameCount = RequestedFrames;
+		else
+			FrameCount = MaxFrames;
+		StartOffset = snd_renderbuffer->startframe % snd_renderbuffer->maxframes;
+		EndOffset = (snd_renderbuffer->startframe + FrameCount) % snd_renderbuffer->maxframes;
+		if (StartOffset > EndOffset)  // if the buffer wraps
+		{
+			unsigned int PartialLength1, PartialLength2;
 
-		PartialLength1 = (snd_renderbuffer->maxframes - StartOffset) * factor;
-		memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], PartialLength1);
+			PartialLength1 = (snd_renderbuffer->maxframes - StartOffset) * factor;
+			memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], PartialLength1);
 
-		PartialLength2 = FrameCount * factor - PartialLength1;
-		memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2);
-	}
-	else
-		memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor);
+			PartialLength2 = FrameCount * factor - PartialLength1;
+			memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2);
+		}
+		else
+			memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor);
+
+		snd_renderbuffer->startframe += FrameCount;
 
-	snd_renderbuffer->startframe += FrameCount;
+		if (FrameCount < RequestedFrames && developer_insane.integer && vid_activewindow)
+			Con_DPrintf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount);
 
-	if (FrameCount < RequestedFrames && developer.integer >= 1000 && vid_activewindow)
-		Con_Printf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount);
+		sdlaudiotime += RequestedFrames;
 
-	sdlaudiotime += RequestedFrames;
+		SndSys_UnlockRenderBuffer();
+	}
 }
 
 
@@ -101,7 +107,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 		return false;
 	}
 
-	buffersize = (unsigned int)ceil((double)requested->speed / 20.0);
+	buffersize = (unsigned int)ceil((double)requested->speed / 25.0); // 2048 bytes on 24kHz to 48kHz
 
 	// Init the SDL Audio subsystem
 	wantspec.callback = Buffer_Callback;
@@ -154,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 );
@@ -243,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
+}