mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

GESSimpleTimelineLayer: ensure the object can be located before "object-added"

Browse source 
fires
This commit is contained in:
Brandon Lewis 2010-12-15 16:40:59 +00:00 committed by Edward Hervey
parent 7bb28f0a6a
commit c60a4b5734
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ges/ges-simple-timeline-layer.c
View file

@ -324,11 +324,16 @@ ges_simple_timeline_layer_add_object (GESSimpleTimelineLayer * layer,
priv->adding_object = TRUE; priv->adding_object = TRUE;
/* provisionally insert the object */
priv->objects = g_list_insert (priv->objects, object, position);
res = ges_timeline_layer_add_object ((GESTimelineLayer *) layer, object); res = ges_timeline_layer_add_object ((GESTimelineLayer *) layer, object);
/* Add to layer */ /* Add to layer */
if (G_UNLIKELY (!res)) { if (G_UNLIKELY (!res)) {
priv->adding_object = FALSE; priv->adding_object = FALSE;
/* we failed to add the object, so remove it from our list */
priv->objects = g_list_remove (priv->objects, object);
return FALSE; return FALSE;
} }
@ -336,7 +341,6 @@ ges_simple_timeline_layer_add_object (GESSimpleTimelineLayer * layer,
GST_DEBUG ("Adding object %p to the list", object); GST_DEBUG ("Adding object %p to the list", object);
priv->objects = g_list_insert (priv->objects, object, position);
g_signal_connect (G_OBJECT (object), "notify::height", G_CALLBACK g_signal_connect (G_OBJECT (object), "notify::height", G_CALLBACK
(timeline_object_height_changed_cb), layer); (timeline_object_height_changed_cb), layer);