mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-01 21:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges: makes "pass over" accurate and reset priority when transition is removed

Browse source
This commit is contained in:
Mathieu Duponchelle 2011-09-14 14:58:01 +02:00 committed by Thibault Saunier
parent 31688a9354
commit 7212307db5
1 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
ges/ges-timeline-layer.c
View file

@ -430,21 +430,24 @@ static void
compare (GList * compared, GESTrackObject * track_object, gboolean ahead) compare (GList * compared, GESTrackObject * track_object, gboolean ahead)
{ {
GList *tmp; GList *tmp;
gint64 start, duration, compared_start, compared_duration, tr_start, gint64 start, duration, compared_start, compared_duration, end, compared_end,
tr_duration; tr_start, tr_duration;
GESTimelineStandardTransition *tr = NULL; GESTimelineStandardTransition *tr = NULL;
GESTrack *track; GESTrack *track;
GESTimelineLayer *layer; GESTimelineLayer *layer;
GESTimelineObject *object, *first_object, *second_object; GESTimelineObject *object, *compared_object, *first_object, *second_object;
gint priority; gint priority;
object = ges_track_object_get_timeline_object (track_object); object = ges_track_object_get_timeline_object (track_object);
compared_object = ges_track_object_get_timeline_object (compared->data);
layer = ges_timeline_object_get_layer (object); layer = ges_timeline_object_get_layer (object);
start = ges_track_object_get_start (track_object); start = ges_track_object_get_start (track_object);
duration = ges_track_object_get_duration (track_object); duration = ges_track_object_get_duration (track_object);
compared_start = ges_track_object_get_start (compared->data); compared_start = ges_track_object_get_start (compared->data);
compared_duration = ges_track_object_get_duration (compared->data); compared_duration = ges_track_object_get_duration (compared->data);
end = start + duration;
compared_end = compared_start + compared_duration;
if (ahead) { if (ahead) {
for (tmp = compared->next; tmp; tmp = tmp->next) { for (tmp = compared->next; tmp; tmp = tmp->next) {
@ -459,19 +462,33 @@ compare (GList * compared, GESTrackObject * track_object, gboolean ahead)
} }
} }
} }
if (compared_start + compared_duration <= start) {
if (compared_end <= start) {
if (tr) { if (tr) {
ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (tr)); ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (tr));
g_object_get (compared_object, "priority", &priority, NULL);
g_object_set (object, "priority", priority, NULL);
} }
goto clean; goto clean;
} else if (start + duration < compared_start + compared_duration) { } else if (start > compared_start && end < compared_end) {
if (tr) {
ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (tr));
}
if (start - compared_start < compared_end - end) {
ges_track_object_set_start (track_object, compared_end - duration + 1);
compare (compared, track_object, FALSE);
} else {
ges_track_object_set_start (track_object, compared_start - 1);
compare (compared, track_object, FALSE);
}
goto clean;
} else if (start <= compared_start) {
if (tr) { if (tr) {
ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (tr)); ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (tr));
} }
ges_track_object_set_start (track_object, compared_start - 5);
compare (compared, track_object, FALSE);
goto clean; goto clean;
} }
} else { } else {
for (tmp = compared->prev; tmp; tmp = tmp->prev) { for (tmp = compared->prev; tmp; tmp = tmp->prev) {
if GES_IS_TRACK_TRANSITION if GES_IS_TRACK_TRANSITION
@ -485,15 +502,29 @@ compare (GList * compared, GESTrackObject * track_object, gboolean ahead)
} }
} }
} }
if (start + duration <= compared_start) { if (start + duration <= compared_start) {
if (tr) {
ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (tr));
g_object_get (object, "priority", &priority, NULL);
g_object_set (compared_object, "priority", priority, NULL);
}
goto clean;
} else if (start > compared_start) {
if (tr) { if (tr) {
ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (tr)); ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (tr));
} }
goto clean; goto clean;
} else if (start + 10 >= compared_start) { } else if (start < compared_start && end > compared_end) {
if (tr) { if (tr) {
ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (tr)); ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (tr));
} }
if (compared_start - start < end - compared_end) {
ges_track_object_set_start (track_object, compared_end - duration - 1);
compare (compared, track_object, TRUE);
} else {
ges_track_object_set_start (track_object, compared_start + 1);
}
goto clean; goto clean;
} }
} }