From 90c6865d383d9b608cd288f9fccd5b35210f6bb1 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 9 Jul 2007 00:25:31 +0000 Subject: [PATCH] Reverted patch in revision #3139, since it changes behaviour, which isn't good at this stage of 1.2. --- src/audio/SDL_audio.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c index e279aad80..e0102ad00 100644 --- a/src/audio/SDL_audio.c +++ b/src/audio/SDL_audio.c @@ -117,13 +117,6 @@ static AudioBootStrap *bootstrap[] = { }; SDL_AudioDevice *current_audio = 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; - /* Various local functions */ int SDL_AudioInit(const char *driver_name); void SDL_AudioQuit(void); @@ -198,9 +191,7 @@ int SDLCALL SDL_RunAudio(void *audiop) } } - if ( must_init_callback_buffer ) { - SDL_memset(stream, silence, stream_len); - } + SDL_memset(stream, silence, stream_len); if ( ! audio->paused ) { SDL_mutexP(audio->mixer_lock); @@ -310,9 +301,6 @@ int SDL_AudioInit(const char *driver_name) { SDL_AudioDevice *audio; int i = 0, idx; - const char *envr = SDL_getenv("SDL_AUDIO_MUST_INIT_BUFFERS"); - - must_init_callback_buffer = ((envr != NULL) && (SDL_atoi(envr))); /* Check to make sure we don't overwrite 'current_audio' */ if ( current_audio != NULL ) {