We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch that implements SDL_PushAudio

sdl-pushaudio.patch (text/plain), 2.97 KB, created by Paul Cercueil on 2012-06-03 11:11:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Cercueil

Created: 2012-06-03 11:11:36 UTC

Size: 2.97 KB

patch

obsolete

>diff --git a/include/SDL_audio.h b/include/SDL_audio.h
>index e879c98..5bf5896 100644
>--- a/include/SDL_audio.h
>+++ b/include/SDL_audio.h
>@@ -177,6 +177,8 @@ extern DECLSPEC char * SDLCALL SDL_AudioDriverName(char *namebuf, int maxlen);
>  */
> extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained);
> 
>+extern DECLSPEC void SDL_PushAudio(Uint8 *buf, int len);
>+
> typedef enum {
> 	SDL_AUDIO_STOPPED = 0,
> 	SDL_AUDIO_PLAYING,
>diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
>index beb26e0..fda81ec 100644
>--- a/src/audio/SDL_audio.c
>+++ b/src/audio/SDL_audio.c
>@@ -394,6 +394,68 @@ char *SDL_AudioDriverName(char *namebuf, int maxlen)
> 	return(NULL);
> }
> 
>+static struct {
>+	SDL_cond *cond;
>+	SDL_mutex *mutex;
>+	Uint8 *buf;
>+	int len;
>+	int offset;
>+} pushaudio;
>+
>+void SDL_PushAudio(Uint8 *buf, int len)
>+{
>+	if ( current_audio && current_audio->enabled ) {
>+		while ( pushaudio.offset + len >= pushaudio.len ) {
>+			int nb = pushaudio.len - pushaudio.offset;
>+			SDL_memcpy(pushaudio.buf + pushaudio.offset, buf, nb);
>+			buf += nb;
>+			len -= nb;
>+
>+			SDL_CondWait(pushaudio.cond, pushaudio.mutex);
>+			pushaudio.offset = 0;
>+		}
>+
>+		if ( len ) {
>+			SDL_memcpy(pushaudio.buf + pushaudio.offset, buf, len);
>+			pushaudio.offset += len;
>+		}
>+	}
>+}
>+
>+static void SDL_PushAudioCallback(void *d, Uint8 *stream, int len)
>+{
>+	SDL_memcpy(stream, pushaudio.buf, len);
>+	SDL_CondSignal(pushaudio.cond);
>+}
>+
>+static void SDL_PushAudioInit(SDL_AudioDevice *audio)
>+{
>+	if ( audio == NULL ) {
>+		SDL_SetError("Audio device not initialized");
>+		return;
>+	}
>+
>+	if ( audio->convert.needed )
>+		pushaudio.len = audio->convert.len;
>+	else
>+		pushaudio.len = audio->spec.size;
>+
>+	pushaudio.buf = SDL_malloc(pushaudio.len);
>+	SDL_memset(pushaudio.buf, 0, pushaudio.len);
>+
>+	pushaudio.offset = 0;
>+	pushaudio.cond = SDL_CreateCond();
>+	pushaudio.mutex = SDL_CreateMutex();
>+	SDL_mutexP(pushaudio.mutex);
>+}
>+
>+static void SDL_PushAudioExit(void)
>+{
>+	SDL_DestroyMutex(pushaudio.mutex);
>+	SDL_DestroyCond(pushaudio.cond);
>+	SDL_free(pushaudio.buf);
>+}
>+
> int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained)
> {
> 	SDL_AudioDevice *audio;
>@@ -470,8 +532,7 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained)
> 		desired->samples = power2;
> 	}
> 	if ( desired->callback == NULL ) {
>-		SDL_SetError("SDL_OpenAudio() passed a NULL callback");
>-		return(-1);
>+		desired->callback = SDL_PushAudioCallback;
> 	}
> 
> #if SDL_THREADS_DISABLED
>@@ -544,6 +605,10 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained)
> 		}
> 	}
> 
>+	if ( audio->spec.callback == SDL_PushAudioCallback ) {
>+		SDL_PushAudioInit(audio);
>+	}
>+
> 	/* Start the audio thread if necessary */
> 	switch (audio->opened) {
> 		case  1:
>@@ -642,6 +707,9 @@ void SDL_AudioQuit(void)
> 			audio->CloseAudio(audio);
> 			audio->opened = 0;
> 		}
>+		if ( audio->spec.callback == SDL_PushAudioCallback) {
>+			SDL_PushAudioExit();
>+		}
> 		/* Free the driver data */
> 		audio->free(audio);
> 		current_audio = NULL;

Actions: View | Diff

Attachments on bug 1511: 869

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.