Reverted patch in revision #3139, since it changes behaviour, which isn't good SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Mon, 09 Jul 2007 00:25:31 +0000
branchSDL-1.2
changeset 4024 000a99b4be87
parent 4023 5ec68276e4de
child 4025 3ee8c808638b
Reverted patch in revision #3139, since it changes behaviour, which isn't good at this stage of 1.2.
src/audio/SDL_audio.c
--- a/src/audio/SDL_audio.c	Sun Jul 08 22:58:33 2007 +0000
+++ b/src/audio/SDL_audio.c	Mon Jul 09 00:25:31 2007 +0000
@@ -117,13 +117,6 @@
 };
 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 @@
 			}
 		}
 
-		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 @@
 {
 	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 ) {