[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/51] paaudio: properly disconnect streams in fini_
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH 22/51] paaudio: properly disconnect streams in fini_* |
Date: |
Thu, 14 Jan 2016 14:45:35 +0100 |
Currently this needs a workaround due to bug #74624 in pulseaudio.
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
audio/paaudio.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 53561dd..c9b2fcd 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -679,6 +679,25 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings
*as, void *drv_opaque)
return -1;
}
+static void qpa_simple_disconnect(PAConnection *c, pa_stream *stream)
+{
+ int err;
+
+ pa_threaded_mainloop_lock(c->mainloop);
+ /* wait until actually connects. workaround pa bug #74624
+ * https://bugs.freedesktop.org/show_bug.cgi?id=74624 */
+ while (pa_stream_get_state(stream) == PA_STREAM_CREATING) {
+ pa_threaded_mainloop_wait(c->mainloop);
+ }
+
+ err = pa_stream_disconnect(stream);
+ if (err != 0) {
+ dolog("Failed to dissconnect! err=%d\n", err);
+ }
+ pa_stream_unref(stream);
+ pa_threaded_mainloop_unlock(c->mainloop);
+}
+
static void qpa_fini_out (HWVoiceOut *hw)
{
void *ret;
@@ -690,7 +709,7 @@ static void qpa_fini_out (HWVoiceOut *hw)
audio_pt_join (&pa->pt, &ret, AUDIO_FUNC);
if (pa->stream) {
- pa_stream_unref (pa->stream);
+ qpa_simple_disconnect(pa->g->conn, pa->stream);
pa->stream = NULL;
}
@@ -710,7 +729,7 @@ static void qpa_fini_in (HWVoiceIn *hw)
audio_pt_join (&pa->pt, &ret, AUDIO_FUNC);
if (pa->stream) {
- pa_stream_unref (pa->stream);
+ qpa_simple_disconnect(pa->g->conn, pa->stream);
pa->stream = NULL;
}
--
2.7.0
- [Qemu-devel] [PATCH 13/51] sdlaudio: port to -audiodev config, (continued)
- [Qemu-devel] [PATCH 13/51] sdlaudio: port to -audiodev config, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 16/51] audio: -audiodev command line option: cleanup, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 15/51] wavaudio: port to -audiodev config, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 10/51] noaudio: port to -audiodev config, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 11/51] ossaudio: port to -audiodev config, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 07/51] alsaaudio: port to -audiodev config, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 14/51] spiceaudio: port to -audiodev config, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 09/51] dsoundaudio: port to -audiodev config, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 12/51] paaudio: port to -audiodev config, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 06/51] audio: -audiodev command line option basic implementation, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 22/51] paaudio: properly disconnect streams in fini_*,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH 34/51] sdlaudio: port to the new audio backend api, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 21/51] paaudio: do not move stream when sink/source name is specified, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 19/51] audio: add audiodev properties to frontends, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 28/51] audio: api for mixeng code free backends, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 29/51] alsaaudio: port to the new audio backend api, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 31/51] noaudio: port to the new audio backend api, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 26/51] audio: remove read and write pcm_ops, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 27/51] audio: use size_t where makes sense, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 30/51] coreaudio: port to the new audio backend api, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 25/51] paaudio: fix playback glitches, Kővágó, Zoltán, 2016/01/14