mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 11:32:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

trackobject: Enable adding a TrackObject in a Track before a TimelineObject

Browse source 
We were requiring it only for GESCustomTimelineSource, but it is not actually
necessary so, we can just check if the TrackObject is in a TimelineObject or
not, and react accordingly.
This commit is contained in:
Thibault Saunier 2012-01-26 11:53:54 +01:00
parent 149ceeab2e
commit a762e72c13
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ges/ges-track-object.c
View file

@ -728,7 +728,7 @@ ensure_gnl_object (GESTrackObject * object)
GESTrackObjectClass *class; GESTrackObjectClass *class;
GstElement *gnlobject; GstElement *gnlobject;
GHashTable *props_hash; GHashTable *props_hash;
gboolean res = FALSE; gboolean res = TRUE;
if (object->priv->gnlobject && object->priv->valid) if (object->priv->gnlobject && object->priv->valid)
return FALSE; return FALSE;
@ -760,9 +760,12 @@ ensure_gnl_object (GESTrackObject * object)
if (gnlobject) { if (gnlobject) {
GST_DEBUG ("Got a valid GnlObject, now filling it in"); GST_DEBUG ("Got a valid GnlObject, now filling it in");
res = if (object->priv->timelineobj)
ges_timeline_object_fill_track_object (object->priv->timelineobj, res = ges_timeline_object_fill_track_object (object->priv->timelineobj,
object, object->priv->gnlobject); object, object->priv->gnlobject);
else
res = TRUE;
if (res) { if (res) {
/* Connect to property notifications */ /* Connect to property notifications */
/* FIXME : remember the signalids so we can remove them later on !!! */ /* FIXME : remember the signalids so we can remove them later on !!! */