mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-01 06:01:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

element: Properly handle the fact that pasting can return NULL

Browse source 
And fix paste annotation
This commit is contained in:
Thibault Saunier 2019-05-25 16:05:00 -04:00 committed by Thibault Saunier
parent 0f238144bf
commit ded3a5fb2f
3 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ges/ges-clip.c
View file

@ -649,7 +649,6 @@ _paste (GESTimelineElement * element, GESTimelineElement * ref,
if (!ges_layer_add_clip (self->priv->copied_layer, nclip)) { if (!ges_layer_add_clip (self->priv->copied_layer, nclip)) {
GST_INFO ("%" GES_FORMAT " could not be pasted to %" GST_TIME_FORMAT, GST_INFO ("%" GES_FORMAT " could not be pasted to %" GST_TIME_FORMAT,
GES_ARGS (element), GST_TIME_ARGS (paste_position)); GES_ARGS (element), GST_TIME_ARGS (paste_position));
gst_object_unref (nclip);
return NULL; return NULL;
} }

5
ges/ges-timeline-element.c
View file

@ -1897,7 +1897,8 @@ ges_timeline_element_get_track_types (GESTimelineElement * self)
* using ges_timeline_element_copy with recurse=TRUE set, * using ges_timeline_element_copy with recurse=TRUE set,
* otherwise it will fail. * otherwise it will fail.
* *
* Returns: (transfer none): Paste @self copying the element * Returns: (transfer full): New element resulting of pasting @self
* or %NULL
* *
* Since: 1.6.0 * Since: 1.6.0
*/ */
@ -1925,7 +1926,7 @@ ges_timeline_element_paste (GESTimelineElement * self,
g_clear_object (&self->priv->copied_from); g_clear_object (&self->priv->copied_from);
return g_object_ref (res); return res ? g_object_ref (res) : res;
} }
/** /**

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

@ -677,6 +677,28 @@ class TestInvalidOverlaps(common.GESSimpleTimelineTest):
] ]
]) ])
def test_copy_paste_overlapping(self):
self.track_types = [GES.TrackType.AUDIO]
super().setUp()
clip = self.append_clip()
copy = clip.copy(True)
self.assertIsNone(copy.paste(copy.props.start))
self.assertTimelineTopology([
[
(GES.TestClip, 0, 10),
]
])
copy = clip.copy(True)
self.assertIsNotNone(copy.paste(copy.props.start + 1))
self.assertTimelineTopology([
[
(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()