pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged r3138:3139 from branches/SDL-1.2: Don't init audio callback buffer.

Browse source 
(This already had a concession for devices opened via the 1.2 entry points,
 I've changed it to respect the environment variable and do it for all devices
 now.)

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402412
This commit is contained in:
Ryan C. Gordon 2007-07-05 02:30:10 +00:00
parent 1066adb528
commit 409c8b5862
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/audio/SDL_audio.c
View file

@ -144,6 +144,13 @@ static AudioBootStrap *bootstrap[] = {
NULL
};
/*
* If non-zero, use legacy behaviour (memset the callback buffer before call).
* Changed to NOT initializing the buffer before the callback in 1.2.12.
* Set environment SDL_AUDIO_MUST_INIT_BUFFERS=1 to get old behaviour.
*/
static int must_init_callback_buffer = 0;
static SDL_AudioDevice *
get_audio_device(SDL_AudioDeviceID id)
{
@ -258,7 +265,6 @@ int SDLCALL
SDL_RunAudio(void *devicep)
{
SDL_AudioDevice *device = (SDL_AudioDevice *) devicep;
const int legacy_device = (device == open_devices[0]);
Uint8 *stream;
int stream_len;
void *udata;
@ -303,7 +309,7 @@ SDL_RunAudio(void *devicep)
}
/* New code should fill buffer or set it to silence themselves. */
if (legacy_device) {
if ( must_init_callback_buffer ) {
SDL_memset(stream, silence, stream_len);
}
@ -390,6 +396,9 @@ SDL_AudioInit(const char *driver_name)
int i = 0;
int initialized = 0;
int tried_to_init = 0;
const char *envr = SDL_getenv("SDL_AUDIO_MUST_INIT_BUFFERS");
must_init_callback_buffer = ((envr != NULL) && (SDL_atoi(envr)));
if (SDL_WasInit(SDL_INIT_AUDIO)) {
SDL_AudioQuit(); /* shutdown driver if already running. */