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"
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)
snd_renderbuffer->startframe += FrameCount;
- if (FrameCount < RequestedFrames && developer.integer >= 1000)
- 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;
}
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 ) ) {
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;
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"
return false;
}
- Con_DPrintf("Obtained audio specification:\n"
+ Con_Printf("Obtained audio specification:\n"
"\tChannels : %i\n"
"\tFormat : 0x%X\n"
"\tFrequency : %i\n"
return false;
}
+ snd_threaded = true;
+
snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL);
if (snd_channellayout.integer == SND_CHANNELLAYOUT_AUTO)
{