fix warnings

[xonotic/darkplaces.git] / snd_sdl.c

diff --git a/snd_sdl.c b/snd_sdl.c
index 032e57500fd14d35793f953b5b57f3e135a716be..667d56b37fcb58c072c38ea17b082336743b43ba 100644 (file)
--- a/snd_sdl.c
+++ b/snd_sdl.c
@@ -39,6 +39,14 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int len)
 
        RequestedFrames = (unsigned int)len / factor;
 
+       if (snd_usethreadedmixing)
+       {
+               S_MixToBuffer(stream, RequestedFrames);
+               if (snd_blocked)
+                       memset(stream, snd_renderbuffer->format.width == 1 ? 0x80 : 0, len);
+               return;
+       }
+
        // Transfert up to a chunk of samples from snd_renderbuffer to stream
        MaxFrames = snd_renderbuffer->endframe - snd_renderbuffer->startframe;
        if (MaxFrames > RequestedFrames)
@@ -83,6 +91,8 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
        SDL_AudioSpec wantspec;
        SDL_AudioSpec obtainspec;
 
+       snd_threaded = false;
+
        Con_DPrint ("SndSys_Init: using the SDL module\n");
 
        // Init the SDL Audio subsystem
@@ -91,7 +101,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;
@@ -140,6 +150,8 @@ 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)
        {