mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

group: Handle clips that get readded to a layer and inside a group

Browse source
This commit is contained in:
Thibault Saunier 2018-07-01 12:21:54 -04:00
parent 38a78651e2
commit 6e5e263306
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ges/ges-group.c
View file

@ -188,13 +188,14 @@ _child_clip_changed_layer_cb (GESTimelineElement * clip,
return; return;
} }
if (new_layer && (layer_prio + offset < 0 || if (new_layer && old_layer && (layer_prio + offset < 0 ||
(GES_TIMELINE_ELEMENT_TIMELINE (group) && (GES_TIMELINE_ELEMENT_TIMELINE (group) &&
layer_prio + offset + GES_CONTAINER_HEIGHT (group) - 1 > layer_prio + offset + GES_CONTAINER_HEIGHT (group) - 1 >
g_list_length (GES_TIMELINE_ELEMENT_TIMELINE (group)->layers)))) { g_list_length (GES_TIMELINE_ELEMENT_TIMELINE (group)->layers)))) {
GST_INFO_OBJECT (container, "Trying to move to a layer outside of" GST_INFO_OBJECT (container,
"the timeline layers, moving back to old layer (prio %i)", "Trying to move to a layer %" GST_PTR_FORMAT " outside of"
"the timeline layers, moving back to old layer (prio %i)", new_layer,
_PRIORITY (group) - offset); _PRIORITY (group) - offset);
container->children_control_mode = GES_CHILDREN_INIBIT_SIGNAL_EMISSION; container->children_control_mode = GES_CHILDREN_INIBIT_SIGNAL_EMISSION;
@ -204,7 +205,7 @@ _child_clip_changed_layer_cb (GESTimelineElement * clip,
return; return;
} }
if (!new_layer) { if (!new_layer || !old_layer) {
_update_our_values (group); _update_our_values (group);
return; return;