mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

composition: Empty current_bin on gnl_composition_reset

Browse source 
Co-Authored by: Thibault Saunier <tsaunier@gnome.org>
This commit is contained in:
Mathieu Duponchelle 2014-07-03 14:32:18 +02:00 committed by Thibault Saunier
parent be37cb14bd
commit 23f58e27e6
1 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
gnl/gnlcomposition.c
View file

@ -1040,6 +1040,32 @@ retry:
gst_iterator_free (children); gst_iterator_free (children);
} }
static gboolean
_remove_child (GValue * item, GValue * ret G_GNUC_UNUSED, GstBin * bin)
{
GstElement *child = g_value_get_object (item);
gst_bin_remove (bin, child);
return TRUE;
}
static void
_empty_bin (GstBin * bin)
{
GstIterator *children;
children = gst_bin_iterate_elements (bin);
while (G_UNLIKELY (gst_iterator_fold (children,
(GstIteratorFoldFunction) _remove_child, NULL,
bin) == GST_ITERATOR_RESYNC)) {
gst_iterator_resync (children);
}
gst_iterator_free (children);
}
static void static void
gnl_composition_reset (GnlComposition * comp) gnl_composition_reset (GnlComposition * comp)
{ {
@ -1074,6 +1100,8 @@ gnl_composition_reset (GnlComposition * comp)
priv->initialized = FALSE; priv->initialized = FALSE;
priv->send_stream_start = TRUE; priv->send_stream_start = TRUE;
_empty_bin (GST_BIN_CAST (priv->current_bin));
GST_DEBUG_OBJECT (comp, "Composition now resetted"); GST_DEBUG_OBJECT (comp, "Composition now resetted");
} }
@ -2449,31 +2477,7 @@ _relink_single_node (GnlComposition * comp, GNode * node,
GST_ELEMENT_NAME (GST_ELEMENT (newobj))); GST_ELEMENT_NAME (GST_ELEMENT (newobj)));
} }
static gboolean
_remove_child (GValue * item, GValue * ret G_GNUC_UNUSED, GstBin * bin)
{
GstElement *child = g_value_get_object (item);
gst_bin_remove (bin, child);
return TRUE;
}
static void
_empty_bin (GstBin * bin)
{
GstIterator *children;
children = gst_bin_iterate_elements (bin);
while (G_UNLIKELY (gst_iterator_fold (children,
(GstIteratorFoldFunction) _remove_child, NULL,
bin) == GST_ITERATOR_RESYNC)) {
gst_iterator_resync (children);
}
gst_iterator_free (children);
}
/* /*
* compare_relink_stack: * compare_relink_stack: