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

timeline-element: Make it possible to reset parent to NULL

Browse source
This commit is contained in:
Thibault Saunier 2013-03-01 22:05:45 -03:00
parent 3136ccf84c
commit c72c14b398
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -262,9 +262,9 @@ ges_timeline_element_set_parent (GESTimelineElement * self,
|| GES_IS_TIMELINE_ELEMENT (parent), FALSE);
g_return_val_if_fail (self != parent, FALSE);
GST_DEBUG_OBJECT (self, "set parent (ref and sink)");
GST_DEBUG_OBJECT (self, "set parent to %" GST_PTR_FORMAT, parent);
if (G_UNLIKELY (self->parent != NULL))
if (self->parent != NULL && parent != NULL)
goto had_parent;
self->parent = parent;
@ -275,7 +275,7 @@ ges_timeline_element_set_parent (GESTimelineElement * self,
/* ERROR handling */
had_parent:
{
GST_DEBUG_OBJECT (self, "set parent failed, object already had a parent");
GST_WARNING_OBJECT (self, "set parent failed, object already had a parent");
return FALSE;
}
}