mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulse: loop while connecting to server

Browse source 
pthread does not guarantee that there are no spurious condition variable
wakeups, neither does pa_threaded_mainloop_xxx() which is a wrapper
around it. So we need to loop around the _wait() function to make sure
we get the right wakeup.

Also, unify the order of the wait loops across the file.
This commit is contained in:
Lennart Poettering 2009-10-17 00:06:15 +02:00 committed by Sebastian Dröge
parent 48c3bd303f
commit fd75286dd1
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/pulse/pulsemixerctrl.c
View file

@ -250,16 +250,12 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
} }
/* Wait until the context is ready */ /* Wait until the context is ready */
pa_threaded_mainloop_wait (c->mainloop); while (pa_context_get_state (c->context) != PA_CONTEXT_READY) {
CHECK_DEAD_GOTO (c, unlock_and_fail);
if (pa_context_get_state (c->context) != PA_CONTEXT_READY) { pa_threaded_mainloop_wait (c->mainloop);
GST_WARNING_OBJECT (c->object, "Failed to connect context: %s",
pa_strerror (pa_context_errno (c->context)));
goto unlock_and_fail;
} }
/* Subscribe to events */ /* Subscribe to events */
if (!(o = if (!(o =
pa_context_subscribe (c->context, pa_context_subscribe (c->context,
PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE, PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE,
@ -271,8 +267,8 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
c->operation_success = FALSE; c->operation_success = FALSE;
while (pa_operation_get_state (o) != PA_OPERATION_DONE) { while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
pa_threaded_mainloop_wait (c->mainloop);
CHECK_DEAD_GOTO (c, unlock_and_fail); CHECK_DEAD_GOTO (c, unlock_and_fail);
pa_threaded_mainloop_wait (c->mainloop);
} }
if (!c->operation_success) { if (!c->operation_success) {
@ -297,8 +293,8 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
c->operation_success = FALSE; c->operation_success = FALSE;
while (pa_operation_get_state (o) != PA_OPERATION_DONE) { while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
pa_threaded_mainloop_wait (c->mainloop);
CHECK_DEAD_GOTO (c, unlock_and_fail); CHECK_DEAD_GOTO (c, unlock_and_fail);
pa_threaded_mainloop_wait (c->mainloop);
} }
pa_operation_unref (o); pa_operation_unref (o);
@ -323,8 +319,8 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
c->operation_success = FALSE; c->operation_success = FALSE;
while (pa_operation_get_state (o) != PA_OPERATION_DONE) { while (pa_operation_get_state (o) != PA_OPERATION_DONE) {
pa_threaded_mainloop_wait (c->mainloop);
CHECK_DEAD_GOTO (c, unlock_and_fail); CHECK_DEAD_GOTO (c, unlock_and_fail);
pa_threaded_mainloop_wait (c->mainloop);
} }
pa_operation_unref (o); pa_operation_unref (o);