mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 18:05:37 +00:00
timeline: No autotrans between elements in same toplevel container
This makes no sense, we ended up creating/removing tons of transition while moving groups
This commit is contained in:
parent
e54ceff720
commit
f7ac18c138
1 changed files with 5 additions and 1 deletions
|
@ -834,6 +834,8 @@ _create_transitions_on_layer (GESTimeline * timeline, GESLayer * layer,
|
||||||
guint *start_or_end = g_sequence_get (iter);
|
guint *start_or_end = g_sequence_get (iter);
|
||||||
GESTrackElement *next = g_hash_table_lookup (timeline->priv->by_object,
|
GESTrackElement *next = g_hash_table_lookup (timeline->priv->by_object,
|
||||||
start_or_end);
|
start_or_end);
|
||||||
|
GESTimelineElement *toplevel =
|
||||||
|
ges_timeline_element_get_toplevel_parent (GES_TIMELINE_ELEMENT (next));
|
||||||
|
|
||||||
/* Only object that are in that layer and track */
|
/* Only object that are in that layer and track */
|
||||||
if (_ges_track_element_get_layer_priority (next) != layer_prio ||
|
if (_ges_track_element_get_layer_priority (next) != layer_prio ||
|
||||||
|
@ -860,7 +862,9 @@ _create_transitions_on_layer (GESTimeline * timeline, GESLayer * layer,
|
||||||
|
|
||||||
GESTrackElement *prev = tmp->data;
|
GESTrackElement *prev = tmp->data;
|
||||||
|
|
||||||
if (ctrack != ges_track_element_get_track (prev))
|
if (ctrack != ges_track_element_get_track (prev) ||
|
||||||
|
ges_timeline_element_get_toplevel_parent (GES_TIMELINE_ELEMENT (prev))
|
||||||
|
== toplevel)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
transition_duration = (_START (prev) + _DURATION (prev)) - _START (next);
|
transition_duration = (_START (prev) + _DURATION (prev)) - _START (next);
|
||||||
|
|
Loading…
Reference in a new issue