mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-03 10:43:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

GESTimeline: add existing timeline objects when adding layers

Browse source
This commit is contained in:
Brandon Lewis 2010-10-19 16:39:43 +01:00 committed by Edward Hervey
parent d9f8563319
commit 170ec1e7ab
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ges/ges-timeline.c
View file

@ -501,6 +501,8 @@ layer_object_removed_cb (GESTimelineLayer * layer, GESTimelineObject * object,
gboolean gboolean
ges_timeline_add_layer (GESTimeline * timeline, GESTimelineLayer * layer) ges_timeline_add_layer (GESTimeline * timeline, GESTimelineLayer * layer)
{ {
GList *objects, *tmp;
GST_DEBUG ("timeline:%p, layer:%p", timeline, layer); GST_DEBUG ("timeline:%p, layer:%p", timeline, layer);
/* We can only add a layer that doesn't already belong to another timeline */ /* We can only add a layer that doesn't already belong to another timeline */
@ -521,9 +523,6 @@ ges_timeline_add_layer (GESTimeline * timeline, GESTimelineLayer * layer)
/* Inform the layer that it belongs to a new timeline */ /* Inform the layer that it belongs to a new timeline */
ges_timeline_layer_set_timeline (layer, timeline); ges_timeline_layer_set_timeline (layer, timeline);
/* FIXME : GO OVER THE LIST OF ALREADY EXISTING TIMELINE OBJECTS IN THAT
* LAYER AND ADD THEM !!! */
/* Connect to 'object-added'/'object-removed' signal from the new layer */ /* Connect to 'object-added'/'object-removed' signal from the new layer */
g_signal_connect (layer, "object-added", G_CALLBACK (layer_object_added_cb), g_signal_connect (layer, "object-added", G_CALLBACK (layer_object_added_cb),
timeline); timeline);
@ -533,6 +532,15 @@ ges_timeline_add_layer (GESTimeline * timeline, GESTimelineLayer * layer)
GST_DEBUG ("Done adding layer, emitting 'layer-added' signal"); GST_DEBUG ("Done adding layer, emitting 'layer-added' signal");
g_signal_emit (timeline, ges_timeline_signals[LAYER_ADDED], 0, layer); g_signal_emit (timeline, ges_timeline_signals[LAYER_ADDED], 0, layer);
/* add any existing timeline objects to the timeline */
objects = ges_timeline_layer_get_objects (layer);
for (tmp = objects; tmp; tmp = tmp->next) {
layer_object_added_cb (layer, tmp->data, timeline);
g_object_unref (tmp->data);
tmp->data = NULL;
}
g_list_free (objects);
return TRUE; return TRUE;
} }