diff options
| author | Mathieu Duponchelle <mathieu.duponchelle@epitech.eu> | 2013-06-29 00:17:31 +0200 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@collabora.com> | 2013-07-12 18:17:00 -0400 |
| commit | 4addde8d742f1699ba5e9f8977ccca7ace7502f8 (patch) | |
| tree | 692a958ffa27413f5ba143b3c959158e189ffb0f | |
| parent | cc9391319eb238c27489f70befe55d7dad84913a (diff) | |
timeline: create_transitions_on_layer *before* actually commiting
Everything need to be in place before commiting, otherwize it makes no
sense at all.
| -rw-r--r-- | ges/ges-timeline.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c index 7dd9530..52fb950 100644 --- a/ges/ges-timeline.c +++ b/ges/ges-timeline.c @@ -2766,6 +2766,11 @@ ges_timeline_commit (GESTimeline * timeline) GST_DEBUG_OBJECT (timeline, "commiting changes"); + for (tmp = timeline->layers; tmp; tmp = tmp->next) { + _create_transitions_on_layer (timeline, GES_LAYER (tmp->data), + NULL, NULL, _find_transition_from_auto_transitions); + } + for (tmp = timeline->tracks; tmp; tmp = tmp->next) { if (!ges_track_commit (GES_TRACK (tmp->data))) res = FALSE; @@ -2774,11 +2779,6 @@ ges_timeline_commit (GESTimeline * timeline) /* Make sure we reset the context */ timeline->priv->movecontext.needs_move_ctx = TRUE; - for (tmp = timeline->layers; tmp; tmp = tmp->next) { - _create_transitions_on_layer (timeline, GES_LAYER (tmp->data), - NULL, NULL, _find_transition_from_auto_transitions); - } - return res; } |