mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulsesink: don't wait for posted message

Browse source 
We can't wait for the ENTER/LEAVE messages to be be posted because the base
class sometimes calls the start method with the object lock, which would block
the message posting.
Instead, just assume that the message will be posted soon and continue. We'll
have to fix this in the base class.
This commit is contained in:
Wim Taymans 2009-07-20 19:04:09 +02:00
parent e914f5254a
commit 8bfd80e5a2
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/pulse/pulsesink.c
View file

@ -859,6 +859,7 @@ mainloop_enter_defer_cb (pa_mainloop_api * api, void *userdata)
message = gst_message_new_stream_status (GST_OBJECT (pulsesink), message = gst_message_new_stream_status (GST_OBJECT (pulsesink),
GST_STREAM_STATUS_TYPE_ENTER, GST_ELEMENT (pulsesink)); GST_STREAM_STATUS_TYPE_ENTER, GST_ELEMENT (pulsesink));
gst_message_set_stream_status_object (message, &val); gst_message_set_stream_status_object (message, &val);
gst_element_post_message (GST_ELEMENT (pulsesink), message); gst_element_post_message (GST_ELEMENT (pulsesink), message);
/* signal the waiter */ /* signal the waiter */
@ -883,9 +884,6 @@ gst_pulseringbuffer_start (GstRingBuffer * buf)
pa_mainloop_api_once (pa_threaded_mainloop_get_api (psink->mainloop), pa_mainloop_api_once (pa_threaded_mainloop_get_api (psink->mainloop),
mainloop_enter_defer_cb, psink); mainloop_enter_defer_cb, psink);
while (psink->pa_defer_ran == FALSE)
pa_threaded_mainloop_wait (psink->mainloop);
GST_DEBUG_OBJECT (psink, "starting"); GST_DEBUG_OBJECT (psink, "starting");
pbuf->paused = FALSE; pbuf->paused = FALSE;
gst_pulsering_set_corked (pbuf, FALSE, FALSE); gst_pulsering_set_corked (pbuf, FALSE, FALSE);
@ -988,9 +986,6 @@ cleanup:
mainloop_leave_defer_cb, psink); mainloop_leave_defer_cb, psink);
GST_DEBUG_OBJECT (psink, "waiting for stream status"); GST_DEBUG_OBJECT (psink, "waiting for stream status");
while (psink->pa_defer_ran == FALSE)
pa_threaded_mainloop_wait (psink->mainloop);
pa_threaded_mainloop_unlock (psink->mainloop); pa_threaded_mainloop_unlock (psink->mainloop);
return res; return res;