From 6c6d4911cd086dd50a0c5e66168b448b0a9b19e4 Mon Sep 17 00:00:00 2001 From: Brandon Lewis Date: Fri, 9 Jul 2010 12:10:06 +0200 Subject: [PATCH] use object height in gstl recalcuate --- ges/ges-simple-timeline-layer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ges/ges-simple-timeline-layer.c b/ges/ges-simple-timeline-layer.c index b9ea0074ae..533b175f00 100644 --- a/ges/ges-simple-timeline-layer.c +++ b/ges/ges-simple-timeline-layer.c @@ -111,6 +111,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self) GstClockTime pos = 0; gint priority = 0; gint transition_priority = 0; + gint height; GESTimelineObject *prev_object = NULL; GESTimelineObject *prev_transition = NULL; @@ -125,12 +126,13 @@ gstl_recalculate (GESSimpleTimelineLayer * self) obj = (GESTimelineObject *) tmp->data; dur = GES_TIMELINE_OBJECT_DURATION (obj); + height = GES_TIMELINE_OBJECT_HEIGHT (obj); - GST_DEBUG ("obj: %p, %ld", obj, pos); + GST_DEBUG ("obj: %p, %ld, height: %d", obj, pos, height); if (GES_IS_TIMELINE_SOURCE (obj)) { - priority++; + priority += height; if (G_UNLIKELY (GES_TIMELINE_OBJECT_START (obj) != pos)) { ges_timeline_object_set_start (obj, pos);