mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gstbin.c: Same fix as Ronald's but without the signal.

Browse source 
Original commit message from CVS:
* gst/gstbin.c: (gst_bin_remove_func), (gst_bin_get_state):
Same fix as Ronald's but without the signal.
This commit is contained in:
Wim Taymans 2005-05-12 13:18:14 +00:00
parent e5f4d65005
commit 8694ff47b4
2 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-05-12 Wim Taymans <wim@fluendo.com>
* gst/gstbin.c: (gst_bin_remove_func), (gst_bin_get_state):
Same fix as Ronald's but without the signal.
2005-05-12 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/gstutils.c: (gst_element_query_position):

25
gst/gstbin.c
View file

@ -496,6 +496,14 @@ gst_bin_remove_func (GstBin * bin, GstElement * element)
gst_element_set_bus (element, NULL);
gst_element_set_scheduler (element, NULL);
/* unlock any waiters for the state change. It is possible that
* we are waiting for an ASYNC state change on this element. The
* element cannot be added to another bin yet as it is not yet
* unparented. */
GST_STATE_LOCK (element);
GST_STATE_BROADCAST (element);
GST_STATE_UNLOCK (element);
/* we ref here because after the _unparent() the element can be disposed
* and we still need it to fire a signal. */
gst_object_ref (GST_OBJECT_CAST (element));
@ -760,19 +768,6 @@ gst_bin_iterate_sinks (GstBin * bin)
return result;
}
/*
* This function will be called if the child is removed from the bin
* while we try to get its state. We should abort the _get_state()
* immediately to prevent pointless further blocking.
*/
static void
cb_parent_unset (GstElement * child, GstElement * parent, gpointer data)
{
GST_STATE_LOCK (child);
GST_STATE_BROADCAST (child);
GST_STATE_UNLOCK (child);
}
/* this functions loops over all children, as soon as one does
* not return SUCCESS, we return that value.
*
@ -799,16 +794,12 @@ restart:
children_cookie = bin->children_cookie;
while (children) {
GstElement *child = GST_ELEMENT_CAST (children->data);
gulong sig;
gst_object_ref (GST_OBJECT_CAST (child));
GST_UNLOCK (bin);
/* ret is ASYNC if some child is still performing the state change */
sig = g_signal_connect (child, "parent-unset",
G_CALLBACK (cb_parent_unset), NULL);
ret = gst_element_get_state (child, NULL, NULL, timeout);
g_signal_handler_disconnect (child, sig);
gst_object_unref (GST_OBJECT_CAST (child));