[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/25] paaudio: properly disconnect streams in fini_
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH 16/25] paaudio: properly disconnect streams in fini_* |
Date: |
Thu, 6 Aug 2015 20:28:28 +0200 |
Currently this needs a workaround due to bug #74624 in pulseaudio.
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 e3b8207..2aee22f 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -678,6 +678,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;
@@ -689,7 +708,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;
}
@@ -709,7 +728,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.4.5
- [Qemu-devel] [PATCH 00/25] audio: -audiodev option, multiple options, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 02/25] qapi: convert NumaOptions into a flat union, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 01/25] qapi: support implicit structs in OptsVisitor, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 04/25] net: use Netdev instead of NetClientOptions in client init, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 03/25] net: remove NetLegacy struct, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 20/25] audio: remove mixeng specific code from backends, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 10/25] audio: -audiodev command line option, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 16/25] paaudio: properly disconnect streams in fini_*,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH 24/25] paaudio: get/put_buffer functions, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 19/25] paaudio: fix playback glitches, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 18/25] audio: do not run each backend in audio_run, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 25/25] audio: split ctl_* functions into enable_* and volume_*, Kővágó, Zoltán, 2015/08/06