| Message ID | 02a720bfd7c6bb09c9cedb505516f07f0b395838.1562695780.git.DirtY.iCE.hu@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Multiple simultaneous audio backends | expand |
On Tue, Jul 9, 2019 at 10:53 PM Kővágó, Zoltán <dirty.ice.hu@gmail.com> wrote: > > Currently this needs a workaround due to bug #247 in pulseaudio. > > Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com> > --- > audio/paaudio.c | 25 +++++++++++++++++++++++-- > 1 file changed, 23 insertions(+), 2 deletions(-) > > diff --git a/audio/paaudio.c b/audio/paaudio.c > index 24d98b344a..490bcd770e 100644 > --- a/audio/paaudio.c > +++ b/audio/paaudio.c > @@ -685,6 +685,27 @@ 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 #247 > + * https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/247 > + */ > + 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); disconnect Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > + } > + pa_stream_unref(stream); > + pa_threaded_mainloop_unlock(c->mainloop); > +} > + > static void qpa_fini_out (HWVoiceOut *hw) > { > void *ret; > @@ -696,7 +717,7 @@ static void qpa_fini_out (HWVoiceOut *hw) > audio_pt_join(&pa->pt, &ret, __func__); > > if (pa->stream) { > - pa_stream_unref (pa->stream); > + qpa_simple_disconnect(pa->g->conn, pa->stream); > pa->stream = NULL; > } > > @@ -716,7 +737,7 @@ static void qpa_fini_in (HWVoiceIn *hw) > audio_pt_join(&pa->pt, &ret, __func__); > > if (pa->stream) { > - pa_stream_unref (pa->stream); > + qpa_simple_disconnect(pa->g->conn, pa->stream); > pa->stream = NULL; > } > > -- > 2.22.0 > > -- Marc-André Lureau
diff --git a/audio/paaudio.c b/audio/paaudio.c index 24d98b344a..490bcd770e 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -685,6 +685,27 @@ 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 #247 + * https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/247 + */ + 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; @@ -696,7 +717,7 @@ static void qpa_fini_out (HWVoiceOut *hw) audio_pt_join(&pa->pt, &ret, __func__); if (pa->stream) { - pa_stream_unref (pa->stream); + qpa_simple_disconnect(pa->g->conn, pa->stream); pa->stream = NULL; } @@ -716,7 +737,7 @@ static void qpa_fini_in (HWVoiceIn *hw) audio_pt_join(&pa->pt, &ret, __func__); if (pa->stream) { - pa_stream_unref (pa->stream); + qpa_simple_disconnect(pa->g->conn, pa->stream); pa->stream = NULL; }
Currently this needs a workaround due to bug #247 in pulseaudio. Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com> --- audio/paaudio.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)