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

container: Handle children pasting failures

Browse source
This commit is contained in:
Thibault Saunier 2019-05-25 20:20:07 -04:00 committed by Thibault Saunier
parent 3b95bec095
commit b3e449fd4f
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ges/ges-container.c
View file

@ -348,6 +348,15 @@ _paste (GESTimelineElement * element, GESTimelineElement * ref,
nchild = nchild =
ges_timeline_element_paste (map->child, ges_timeline_element_paste (map->child,
paste_position - map->start_offset); paste_position - map->start_offset);
if (!nchild) {
while (ncontainer->children)
ges_container_remove (ncontainer, ncontainer->children->data);
g_object_unref (ncontainer);
return NULL;
}
ges_timeline_element_set_timeline (GES_TIMELINE_ELEMENT (ncontainer), ges_timeline_element_set_timeline (GES_TIMELINE_ELEMENT (ncontainer),
GES_TIMELINE_ELEMENT_TIMELINE (ref)); GES_TIMELINE_ELEMENT_TIMELINE (ref));
ges_container_add (ncontainer, nchild); ges_container_add (ncontainer, nchild);

15
tests/check/python/test_timeline.py
View file

@ -721,6 +721,21 @@ class TestInvalidOverlaps(common.GESSimpleTimelineTest):
], ],
]) ])
group = GES.Group.new()
group.add(clip)
copied_group = group.copy(True)
self.assertFalse(copied_group.paste(group.props.start))
self.assertTimelineTopology([
[
(GES.TestClip, 0, 10),
],
[
(GES.TestClip, 0, 10),
(GES.TestClip, 1, 10),
],
])
def test_move_group_with_overlaping_clips(self): def test_move_group_with_overlaping_clips(self):
self.track_types = [GES.TrackType.AUDIO] self.track_types = [GES.TrackType.AUDIO]
super().setUp() super().setUp()