X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_sdl.c;h=583ea1f8b3b00d767f61abab2a2f836bf8f86bf4;hp=bcef10da61f624eeed322fc850dbb7be369f6a4d;hb=1ff3bc8e953680793a28ea923f2d1e58cdf2c9f0;hpb=59d1e032103c4af43759dc4f1b9eaccab7aed1bd

diff --git a/snd_sdl.c b/snd_sdl.c
index bcef10da..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 <math.h>
 #include <SDL.h>
 
 #include "quakedef.h"
+
 #include "snd_main.h"
 
 
@@ -39,33 +39,47 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int len)
 
 	RequestedFrames = (unsigned int)len / factor;
 
-	// 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
+	if (SndSys_LockRenderBuffer())
 	{
-		unsigned int PartialLength1, PartialLength2;
+		if (snd_usethreadedmixing)
+		{
+			S_MixToBuffer(stream, RequestedFrames);
+			if (snd_blocked)
+				memset(stream, snd_renderbuffer->format.width == 1 ? 0x80 : 0, len);
+			SndSys_UnlockRenderBuffer();
+			return;
+		}
 
-		PartialLength1 = (snd_renderbuffer->maxframes - StartOffset) * factor;
-		memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], PartialLength1);
+		// 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;
 
-		PartialLength2 = FrameCount * factor - PartialLength1;
-		memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2);
-	}
-	else
-		memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor);
+			PartialLength1 = (snd_renderbuffer->maxframes - StartOffset) * factor;
+			memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], PartialLength1);
 
-	snd_renderbuffer->startframe += FrameCount;
+			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;
+
+		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_DPrintf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount);
+		sdlaudiotime += RequestedFrames;
 
-	sdlaudiotime += RequestedFrames;
+		SndSys_UnlockRenderBuffer();
+	}
 }
 
 
@@ -83,7 +97,9 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 	SDL_AudioSpec wantspec;
 	SDL_AudioSpec obtainspec;
 
-	Con_Print ("SndSys_Init: using the SDL module\n");
+	snd_threaded = false;
+
+	Con_DPrint ("SndSys_Init: using the SDL module\n");
 
 	// Init the SDL Audio subsystem
 	if( SDL_InitSubSystem( SDL_INIT_AUDIO ) ) {
@@ -91,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;
@@ -101,7 +117,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 	wantspec.channels = requested->channels;
 	wantspec.samples = CeilPowerOf2(buffersize);  // needs to be a power of 2 on some platforms.
 
-	Con_DPrintf("Wanted audio Specification:\n"
+	Con_Printf("Wanted audio Specification:\n"
 				"\tChannels  : %i\n"
 				"\tFormat    : 0x%X\n"
 				"\tFrequency : %i\n"
@@ -114,7 +130,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 		return false;
 	}
 
-	Con_DPrintf("Obtained audio specification:\n"
+	Con_Printf("Obtained audio specification:\n"
 				"\tChannels  : %i\n"
 				"\tFormat    : 0x%X\n"
 				"\tFrequency : %i\n"
@@ -140,18 +156,11 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 		return false;
 	}
 
+	snd_threaded = true;
+
 	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 );
@@ -231,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
+}