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 to fix the delay when closing the ALSA and Pulse drivers.

pulsedelay.patch (text/plain), 2.98 KB, created by rgrocottbugzilla on 2012-03-19 16:37:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rgrocottbugzilla

Created: 2012-03-19 16:37:25 UTC

Size: 2.98 KB

patch

obsolete

>diff -r c787fb1b5699 src/audio/alsa/SDL_alsa_audio.c
>--- a/src/audio/alsa/SDL_alsa_audio.c	Mon Feb 20 23:51:08 2012 -0500
>+++ b/src/audio/alsa/SDL_alsa_audio.c	Mon Mar 19 23:34:56 2012 +0000
>@@ -61,7 +61,7 @@
> static snd_pcm_sframes_t (*SDL_NAME(snd_pcm_writei))(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size);
> static int (*SDL_NAME(snd_pcm_recover))(snd_pcm_t *pcm, int err, int silent);
> static int (*SDL_NAME(snd_pcm_prepare))(snd_pcm_t *pcm);
>-static int (*SDL_NAME(snd_pcm_drain))(snd_pcm_t *pcm);
>+static int (*SDL_NAME(snd_pcm_drop))(snd_pcm_t *pcm);
> static const char *(*SDL_NAME(snd_strerror))(int errnum);
> static size_t (*SDL_NAME(snd_pcm_hw_params_sizeof))(void);
> static size_t (*SDL_NAME(snd_pcm_sw_params_sizeof))(void);
>@@ -100,7 +100,7 @@
> 	{ "snd_pcm_writei",	(void**)(char*)&SDL_NAME(snd_pcm_writei)	},
> 	{ "snd_pcm_recover",	(void**)(char*)&SDL_NAME(snd_pcm_recover)	},
> 	{ "snd_pcm_prepare",	(void**)(char*)&SDL_NAME(snd_pcm_prepare)	},
>-	{ "snd_pcm_drain",	(void**)(char*)&SDL_NAME(snd_pcm_drain)	},
>+	{ "snd_pcm_drop",	(void**)(char*)&SDL_NAME(snd_pcm_drop)	},
> 	{ "snd_strerror",	(void**)(char*)&SDL_NAME(snd_strerror)		},
> 	{ "snd_pcm_hw_params_sizeof",		(void**)(char*)&SDL_NAME(snd_pcm_hw_params_sizeof)		},
> 	{ "snd_pcm_sw_params_sizeof",		(void**)(char*)&SDL_NAME(snd_pcm_sw_params_sizeof)		},
>@@ -351,7 +351,7 @@
> 		mixbuf = NULL;
> 	}
> 	if ( pcm_handle ) {
>-		SDL_NAME(snd_pcm_drain)(pcm_handle);
>+		SDL_NAME(snd_pcm_drop)(pcm_handle);
> 		SDL_NAME(snd_pcm_close)(pcm_handle);
> 		pcm_handle = NULL;
> 	}
>diff -r c787fb1b5699 src/audio/pulse/SDL_pulseaudio.c
>--- a/src/audio/pulse/SDL_pulseaudio.c	Mon Feb 20 23:51:08 2012 -0500
>+++ b/src/audio/pulse/SDL_pulseaudio.c	Mon Mar 19 23:34:56 2012 +0000
>@@ -111,7 +111,7 @@
> static size_t (*SDL_NAME(pa_stream_writable_size))(pa_stream *s);
> static int (*SDL_NAME(pa_stream_write))(pa_stream *s, const void *data, size_t nbytes,
> 	pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
>-static pa_operation * (*SDL_NAME(pa_stream_drain))(pa_stream *s,
>+static pa_operation * (*SDL_NAME(pa_stream_flush))(pa_stream *s,
> 	pa_stream_success_cb_t cb, void *userdata);
> static int (*SDL_NAME(pa_stream_disconnect))(pa_stream *s);
> static void (*SDL_NAME(pa_stream_unref))(pa_stream *s);
>@@ -162,8 +162,8 @@
> 		(void **)&SDL_NAME(pa_stream_writable_size)	},
> 	{ "pa_stream_write",
> 		(void **)&SDL_NAME(pa_stream_write)		},
>-	{ "pa_stream_drain",
>-		(void **)&SDL_NAME(pa_stream_drain)		},
>+	{ "pa_stream_flush",
>+		(void **)&SDL_NAME(pa_stream_flush)		},
> 	{ "pa_stream_disconnect",
> 		(void **)&SDL_NAME(pa_stream_disconnect)	},
> 	{ "pa_stream_unref",
>@@ -398,7 +398,7 @@
> 	}
> }
> 
>-static void stream_drain_complete(pa_stream *s, int success, void *userdata)
>+static void stream_flush_complete(pa_stream *s, int success, void *userdata)
> {
> 	/* no-op. */
> }
>@@ -407,7 +407,7 @@
> {
> 	pa_operation *o;
> 
>-	o = SDL_NAME(pa_stream_drain)(stream, stream_drain_complete, NULL);
>+	o = SDL_NAME(pa_stream_flush)(stream, stream_flush_complete, NULL);
> 	if (!o)
> 		return;
>

Actions: View | Diff

Attachments on bug 1449: 838 | 839 | 1415

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.