mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

use object height in gstl recalcuate

Browse source
This commit is contained in:
Brandon Lewis 2010-07-09 12:10:06 +02:00 committed by Edward Hervey
parent 93936321da
commit 6c6d4911cd
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ges/ges-simple-timeline-layer.c
View file

@ -111,6 +111,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
GstClockTime pos = 0; GstClockTime pos = 0;
gint priority = 0; gint priority = 0;
gint transition_priority = 0; gint transition_priority = 0;
gint height;
GESTimelineObject *prev_object = NULL; GESTimelineObject *prev_object = NULL;
GESTimelineObject *prev_transition = NULL; GESTimelineObject *prev_transition = NULL;
@ -125,12 +126,13 @@ gstl_recalculate (GESSimpleTimelineLayer * self)
obj = (GESTimelineObject *) tmp->data; obj = (GESTimelineObject *) tmp->data;
dur = GES_TIMELINE_OBJECT_DURATION (obj); 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)) { if (GES_IS_TIMELINE_SOURCE (obj)) {
priority++; priority += height;
if (G_UNLIKELY (GES_TIMELINE_OBJECT_START (obj) != pos)) { if (G_UNLIKELY (GES_TIMELINE_OBJECT_START (obj) != pos)) {
ges_timeline_object_set_start (obj, pos); ges_timeline_object_set_start (obj, pos);