mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-31 11:32:38 +00:00
trackobject: Enable adding a TrackObject in a Track before a TimelineObject
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:
parent
149ceeab2e
commit
a762e72c13
1 changed files with 7 additions and 4 deletions
|
@ -728,7 +728,7 @@ ensure_gnl_object (GESTrackObject * object)
|
|||
GESTrackObjectClass *class;
|
||||
GstElement *gnlobject;
|
||||
GHashTable *props_hash;
|
||||
gboolean res = FALSE;
|
||||
gboolean res = TRUE;
|
||||
|
||||
if (object->priv->gnlobject && object->priv->valid)
|
||||
return FALSE;
|
||||
|
@ -760,9 +760,12 @@ ensure_gnl_object (GESTrackObject * object)
|
|||
if (gnlobject) {
|
||||
GST_DEBUG ("Got a valid GnlObject, now filling it in");
|
||||
|
||||
res =
|
||||
ges_timeline_object_fill_track_object (object->priv->timelineobj,
|
||||
if (object->priv->timelineobj)
|
||||
res = ges_timeline_object_fill_track_object (object->priv->timelineobj,
|
||||
object, object->priv->gnlobject);
|
||||
else
|
||||
res = TRUE;
|
||||
|
||||
if (res) {
|
||||
/* Connect to property notifications */
|
||||
/* FIXME : remember the signalids so we can remove them later on !!! */
|
||||
|
|
Loading…
Reference in a new issue