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"
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)
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);
}
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;
}
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 ) ) {
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"
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"
return false;
}
+ snd_threaded = true;
+
snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL);
if (snd_channellayout.integer == SND_CHANNELLAYOUT_AUTO)
- Cvar_SetValueQuick (&snd_channellayout, SND_CHANNELLAYOUT_ALSA);
+ {
+ int newlayout;
+
+#ifdef __linux__
+ newlayout = SND_CHANNELLAYOUT_ALSA;
+#else
+ newlayout = SND_CHANNELLAYOUT_STANDARD;
+#endif
+ Cvar_SetValueQuick (&snd_channellayout, newlayout);
+ }
sdlaudiotime = 0;
SDL_PauseAudio( false );
-
+
return true;
}