encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pulseaudio: Just read/dump captured data in FlushCapture. 

Apparently pa_stream_flush() doesn't work as expected:

https://lists.freedesktop.org/archives/pulseaudio-discuss/2012-April/013328.html

Fixes Bugzilla #4087.
This commit is contained in:
Ryan C. Gordon 2018-02-17 18:30:21 -05:00
parent 6867f6189f
commit 97494f5374
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/audio/pulseaudio/SDL_pulseaudio.c
View File

@ -249,12 +249,6 @@ getAppName(void)
return "SDL Application"; /* oh well. */ return "SDL Application"; /* oh well. */
} }
static void
stream_operation_complete_no_op(pa_stream *s, int success, void *userdata)
{
/* no-op for pa_stream_drain(), etc, to use for callback. */
}
static void static void
WaitForPulseOperation(pa_mainloop *mainloop, pa_operation *o) WaitForPulseOperation(pa_mainloop *mainloop, pa_operation *o)
{ {
@ -426,6 +420,8 @@ static void
PULSEAUDIO_FlushCapture(_THIS) PULSEAUDIO_FlushCapture(_THIS)
{ {
struct SDL_PrivateAudioData *h = this->hidden; struct SDL_PrivateAudioData *h = this->hidden;
const void *data = NULL;
size_t nbytes = 0;
if (h->capturebuf != NULL) { if (h->capturebuf != NULL) {
PULSEAUDIO_pa_stream_drop(h->stream); PULSEAUDIO_pa_stream_drop(h->stream);
@ -433,7 +429,22 @@ PULSEAUDIO_FlushCapture(_THIS)
h->capturelen = 0; h->capturelen = 0;
} }
WaitForPulseOperation(h->mainloop, PULSEAUDIO_pa_stream_flush(h->stream, stream_operation_complete_no_op, NULL)); while (SDL_TRUE) {
if (PULSEAUDIO_pa_context_get_state(h->context) != PA_CONTEXT_READY ||
PULSEAUDIO_pa_stream_get_state(h->stream) != PA_STREAM_READY ||
PULSEAUDIO_pa_mainloop_iterate(h->mainloop, 1, NULL) < 0) {
SDL_OpenedAudioDeviceDisconnected(this);
return; /* uhoh, pulse failed! */
}
if (PULSEAUDIO_pa_stream_readable_size(h->stream) == 0) {
break; /* no data available, so we're done. */
}
/* a new fragment is available! Just dump it. */
PULSEAUDIO_pa_stream_peek(h->stream, &data, &nbytes);
PULSEAUDIO_pa_stream_drop(h->stream); /* drop this fragment. */
}
} }
static void static void