added curl function: Curl_Begin_ToMemory; will later use this to load stuff into...

[xonotic/darkplaces.git] / snd_sdl.c

diff --git a/snd_sdl.c b/snd_sdl.c
index b82a56a4737808ff9ffdcf439a933d94711fdac7..667d56b37fcb58c072c38ea17b082336743b43ba 100644 (file)
--- 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"
 
 
@@ -38,7 +38,15 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int len)
                Sys_Error("SDL sound: invalid buffer length passed to Buffer_Callback (%d bytes)\n", 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)
@@ -53,7 +61,7 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int len)
 
                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);
        }
@@ -62,8 +70,8 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int len)
 
        snd_renderbuffer->startframe += FrameCount;
 
-       if (FrameCount < RequestedFrames && developer.integer >= 100)
-               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;
 }
@@ -83,7 +91,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 +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;
@@ -101,7 +111,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"
@@ -109,12 +119,12 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
                                wantspec.channels, wantspec.format, wantspec.freq, wantspec.samples);
 
        if( SDL_OpenAudio( &wantspec, &obtainspec ) )
-       {       
+       {
                Con_Printf( "Failed to open the audio device! (%s)\n", SDL_GetError() );
                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,11 +150,13 @@ 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
@@ -155,7 +167,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 
        sdlaudiotime = 0;
        SDL_PauseAudio( false );
-       
+
        return true;
 }