[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 29/49] paaudio: properly disconnect streams in fi
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH v2 29/49] paaudio: properly disconnect streams in fini_* |
Date: |
Fri, 21 Aug 2015 17:37:25 +0200 |
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 17e8992..3e5612b 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.5.0
- [Qemu-devel] [PATCH v2 20/49] spiceaudio: port to -audiodev config, (continued)
- [Qemu-devel] [PATCH v2 20/49] spiceaudio: port to -audiodev config, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 17/49] ossaudio: port to -audiodev config, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 19/49] sdlaudio: port to -audiodev config, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 12/49] audio: -audiodev command line option basic implementation, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 21/49] wavaudio: port to -audiodev config, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 22/49] audio: -audiodev command line option: cleanup, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 23/49] audio: reduce glob_audio_state usage, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 18/49] paaudio: port to -audiodev config, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 25/49] audio: add audiodev properties to frontends, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 24/49] audio: basic support for multi backend audio, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 29/49] paaudio: properly disconnect streams in fini_*,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH v2 27/49] paaudio: do not create multiple connections to the same server, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 28/49] paaudio: do not move stream when sink/source name is specified, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 31/49] audio: do not run each backend in audio_run, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 32/49] paaudio: fix playback glitches, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 33/49] audio: remove read and write pcm_ops, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 26/49] audio: audiodev= parameters no longer optional when -audiodev present, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 30/49] audio: remove audio_MIN, audio_MAX, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 35/49] audio: api for mixeng code free backends, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 37/49] coreaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 39/49] noaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21