X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=snd_sdl.c;h=2d1f94a6b9c152232ef1b8e3f60764b4d115a63d;hb=e7c65577b00c716d49e0257e01ee2db04ecdd3ee;hp=583ea1f8b3b00d767f61abab2a2f836bf8f86bf4;hpb=b5acdcbcacd63769c1547732596a90b4c773855f;p=xonotic%2Fdarkplaces.git

diff --git a/snd_sdl.c b/snd_sdl.c
index 583ea1f8..2d1f94a6 100644
--- a/snd_sdl.c
+++ b/snd_sdl.c
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 static unsigned int sdlaudiotime = 0;
+static int audio_device = 0;
 
 
 // Note: SDL calls SDL_LockAudio() right before this function, so no need to lock the audio data here
@@ -67,10 +68,20 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int len)
 
 			PartialLength2 = FrameCount * factor - PartialLength1;
 			memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2);
+
+			// As of SDL 2.0 buffer needs to be fully initialized, so fill leftover part with silence
+			// FIXME this is another place that assumes 8bit is always unsigned and others always signed
+			memset(&stream[PartialLength1 + PartialLength2], snd_renderbuffer->format.width == 1 ? 0x80 : 0, len - (PartialLength1 + PartialLength2));
 		}
 		else
+		{
 			memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor);
 
+			// As of SDL 2.0 buffer needs to be fully initialized, so fill leftover part with silence
+			// FIXME this is another place that assumes 8bit is always unsigned and others always signed
+			memset(&stream[FrameCount * factor], snd_renderbuffer->format.width == 1 ? 0x80 : 0, len - (FrameCount * factor));
+		}
+
 		snd_renderbuffer->startframe += FrameCount;
 
 		if (FrameCount < RequestedFrames && developer_insane.integer && vid_activewindow)
@@ -91,7 +102,7 @@ Create "snd_renderbuffer" with the proper sound format if the call is successful
 May return a suggested format if the requested format isn't available
 ====================
 */
-qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
+qboolean SndSys_Init (snd_format_t* fmt)
 {
 	unsigned int buffersize;
 	SDL_AudioSpec wantspec;
@@ -107,14 +118,15 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 		return false;
 	}
 
-	buffersize = (unsigned int)ceil((double)requested->speed / 25.0); // 2048 bytes on 24kHz to 48kHz
+	buffersize = (unsigned int)ceil((double)fmt->speed / 25.0); // 2048 bytes on 24kHz to 48kHz
 
 	// Init the SDL Audio subsystem
+	memset(&wantspec, 0, sizeof(wantspec));
 	wantspec.callback = Buffer_Callback;
 	wantspec.userdata = NULL;
-	wantspec.freq = requested->speed;
-	wantspec.format = ((requested->width == 1) ? AUDIO_U8 : AUDIO_S16SYS);
-	wantspec.channels = requested->channels;
+	wantspec.freq = fmt->speed;
+	wantspec.format = fmt->width == 1 ? AUDIO_U8 : (fmt->width == 2 ? AUDIO_S16SYS : AUDIO_F32);
+	wantspec.channels = fmt->channels;
 	wantspec.samples = CeilPowerOf2(buffersize);  // needs to be a power of 2 on some platforms.
 
 	Con_Printf("Wanted audio Specification:\n"
@@ -124,9 +136,9 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 				"\tSamples   : %i\n",
 				wantspec.channels, wantspec.format, wantspec.freq, wantspec.samples);
 
-	if( SDL_OpenAudio( &wantspec, &obtainspec ) )
+	if ((audio_device = SDL_OpenAudioDevice(NULL, 0, &wantspec, &obtainspec, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE | SDL_AUDIO_ALLOW_CHANNELS_CHANGE)) == 0)
 	{
-		Con_Printf( "Failed to open the audio device! (%s)\n", SDL_GetError() );
+		Con_Errorf( "Failed to open the audio device! (%s)\n", SDL_GetError() );
 		return false;
 	}
 
@@ -137,33 +149,17 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 				"\tSamples   : %i\n",
 				obtainspec.channels, obtainspec.format, obtainspec.freq, obtainspec.samples);
 
-	// If we haven't obtained what we wanted
-	if (wantspec.freq != obtainspec.freq ||
-		wantspec.format != obtainspec.format ||
-		wantspec.channels != obtainspec.channels)
-	{
-		SDL_CloseAudio();
-
-		// Pass the obtained format as a suggested format
-		if (suggested != NULL)
-		{
-			suggested->speed = obtainspec.freq;
-			// FIXME: check the format more carefully. There are plenty of unsupported cases
-			suggested->width = ((obtainspec.format == AUDIO_U8) ? 1 : 2);
-			suggested->channels = obtainspec.channels;
-		}
-
-		return false;
-	}
+	fmt->speed = obtainspec.freq;
+	fmt->channels = obtainspec.channels;
 
 	snd_threaded = true;
 
-	snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL);
+	snd_renderbuffer = Snd_CreateRingBuffer(fmt, 0, NULL);
 	if (snd_channellayout.integer == SND_CHANNELLAYOUT_AUTO)
 		Cvar_SetValueQuick (&snd_channellayout, SND_CHANNELLAYOUT_STANDARD);
 
 	sdlaudiotime = 0;
-	SDL_PauseAudio( false );
+	SDL_PauseAudioDevice(audio_device, 0);
 
 	return true;
 }
@@ -178,8 +174,10 @@ Stop the sound card, delete "snd_renderbuffer" and free its other resources
 */
 void SndSys_Shutdown(void)
 {
-	SDL_CloseAudio();
-
+	if (audio_device > 0) {
+		SDL_CloseAudioDevice(audio_device);
+		audio_device = 0;
+	}
 	if (snd_renderbuffer != NULL)
 	{
 		Mem_Free(snd_renderbuffer->ring);
@@ -224,7 +222,7 @@ Get the exclusive lock on "snd_renderbuffer"
 */
 qboolean SndSys_LockRenderBuffer (void)
 {
-	SDL_LockAudio();
+	SDL_LockAudioDevice(audio_device);
 	return true;
 }
 
@@ -238,7 +236,7 @@ Release the exclusive lock on "snd_renderbuffer"
 */
 void SndSys_UnlockRenderBuffer (void)
 {
-	SDL_UnlockAudio();
+	SDL_UnlockAudioDevice(audio_device);
 }
 
 /*