sdl-ios-xcode: src/audio/SDL_audio.c comparison

Fixed bug #18 Reordered the audio thread loop so there's no initial wait.

author	Sam Lantinga <slouken@libsdl.org>
date	Tue, 21 Mar 2006 06:45:47 +0000
parents	c724c4a99759
children	12b6d331d82a

comparison

equal deleted inserted replaced

-:c724c4a99759
+:1d487a3fab41
 	} else {
 		silence = audio->spec.silence;
 		stream_len = audio->spec.size;
 	}
-	stream = audio->GetAudioBuf(audio);
-	if ( stream == NULL ) {
-		stream = audio->fake_stream;
-	}
 #if SDL_AUDIO_DRIVER_AHI
 	SDL_mutexV(audio->mixer_lock);
 	D(bug("Entering audio loop...\n"));
 #endif
 #endif
 	/* Loop, filling the audio buffers */
 	while ( audio->enabled ) {
-		/* Wait for new current buffer to finish playing */
-		if ( stream == audio->fake_stream ) {
-			SDL_Delay((audio->spec.samples*1000)/audio->spec.freq);
-		} else {
-#if SDL_AUDIO_DRIVER_AHI
-			if ( started > 1 )
-#endif
-			audio->WaitAudio(audio);
-		}
 		/* Fill the current buffer with sound */
 		if ( audio->convert.needed ) {
 			if ( audio->convert.buf ) {
 				stream = audio->convert.buf;
 			} else {
 		}
 		/* Ready current buffer for play and change current buffer */
 		if ( stream != audio->fake_stream ) {
 			audio->PlayAudio(audio);
-#if SDL_AUDIO_DRIVER_AHI
+		}
-/* AmigaOS don't have to wait the first time audio is played! */
-			started++;
+		/* Wait for an audio buffer to become available */
-#endif
+		if ( stream == audio->fake_stream ) {
-		}
+			SDL_Delay((audio->spec.samples*1000)/audio->spec.freq);
-	}
+		} else {
+			audio->WaitAudio(audio);
+		}
+	}
 	/* Wait for the audio to drain.. */
 	if ( audio->WaitDone ) {
 		audio->WaitDone(audio);
 	}

Mercurial > sdl-ios-xcode