mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-06 14:45:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

composition: No need to children state locked anymore

Browse source 
Co-Authored by: Thibault Saunier <tsaunier@gnome.org>
This commit is contained in:
Mathieu Duponchelle 2014-07-14 16:41:25 +02:00 committed by Thibault Saunier
parent c3ba1f7351
commit 73274d8391
1 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnl/gnlcomposition.c
View file

@ -216,8 +216,6 @@ static void _relink_single_node (GnlComposition * comp, GNode * node,
GstEvent * toplevel_seek);
static gboolean _update_pipeline_func (GnlComposition * comp);
static gboolean _commit_func (GnlComposition * comp);
static gboolean lock_child_state (GValue * item, GValue * ret,
gpointer udata G_GNUC_UNUSED);
static gboolean
set_child_caps (GValue * item, GValue * ret G_GNUC_UNUSED, GnlObject * comp);
static GstEvent *get_new_seek_event (GnlComposition * comp, gboolean initial,
@ -866,18 +864,6 @@ reset_child (GValue * item, GValue * ret G_GNUC_UNUSED, gpointer user_data)
return TRUE;
}
static gboolean
lock_child_state (GValue * item, GValue * ret G_GNUC_UNUSED,
gpointer udata G_GNUC_UNUSED)
{
GstElement *child = g_value_get_object (item);
GST_DEBUG_OBJECT (child, "locking state");
gst_element_set_locked_state (child, TRUE);
return TRUE;
}
static void
reset_children (GnlComposition * comp)
{
@ -2187,15 +2173,6 @@ gnl_composition_change_state (GstElement * element, GstStateChange transition)
GST_DEBUG_OBJECT (comp,
"Setting all children to READY and locking their state");
children = gst_bin_iterate_elements (GST_BIN (comp->priv->current_bin));
while (G_UNLIKELY (gst_iterator_fold (children,
(GstIteratorFoldFunction) lock_child_state, NULL,
NULL) == GST_ITERATOR_RESYNC)) {
gst_iterator_resync (children);
}
gst_iterator_free (children);
/* Set caps on all objects */
if (G_UNLIKELY (!gst_caps_is_any (GNL_OBJECT (comp)->caps))) {
children = gst_bin_iterate_elements (GST_BIN (comp->priv->current_bin));