From 852eca115e2f68f7977d5a5490ea9185ebc2ca35 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Fri, 11 Dec 2009 15:15:29 +0100 Subject: [PATCH] GESTimelineObject: Move property setting to an earlier stage. This ensures that any properties set on the TimelineObject will be propagated to the created TrackObjects just after they're created --- ges/ges-timeline-object.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/ges/ges-timeline-object.c b/ges/ges-timeline-object.c index aa46f57636..5f1773071e 100644 --- a/ges/ges-timeline-object.c +++ b/ges/ges-timeline-object.c @@ -196,6 +196,12 @@ ges_timeline_object_create_track_object (GESTimelineObject * object, object->trackobjects = g_list_append (object->trackobjects, g_object_ref (res)); + GST_DEBUG ("Setting properties on newly created TrackObject"); + + ges_track_object_set_start_internal (res, object->start); + ges_track_object_set_priority_internal (res, object->priority); + ges_track_object_set_duration_internal (res, object->duration); + ges_track_object_set_inpoint_internal (res, object->inpoint); } GST_DEBUG ("Returning res:%p", res); @@ -260,16 +266,6 @@ ges_timeline_object_fill_track_object (GESTimelineObject * object, res = class->fill_track_object (object, trackobj, gnlobj); } - if (G_LIKELY (res)) { - GST_DEBUG ("Setting properties"); - - ges_track_object_set_start_internal (trackobj, object->start); - ges_track_object_set_priority_internal (trackobj, object->priority); - ges_track_object_set_duration_internal (trackobj, object->duration); - ges_track_object_set_inpoint_internal (trackobj, object->inpoint); - - } - GST_DEBUG ("Returning res:%d", res); return res;