mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-05 10:12:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges: Fix TimelineObject movement that contains unlocked and relocked objects

Browse source 
Record the TrackObject that initiated a TimelineObject movement so we don't
get inifite loops.

Also fix the new TrackObject calculation:
    child.start = time - offset (not time + offset)
This commit is contained in:
Thibault Saunier 2011-12-16 04:23:58 -03:00
parent 826d4f9a71
commit 53c4eb35db
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ges/ges-timeline-object.c
View file

@ -134,6 +134,8 @@ struct _GESTimelineObjectPrivate
guint nb_effects;
GESTrackObject *initiated_move;
/* The formats supported by this TimelineObject */
GESTrackType supportedformats;
};
@ -743,9 +745,17 @@ ges_timeline_object_set_start_internal (GESTimelineObject * object,
tr = (GESTrackObject *) tmp->data;
map = find_object_mapping (object, tr);
if (ges_track_object_is_locked (tr)) {
if (ges_track_object_is_locked (tr) && tr != object->priv->initiated_move) {
gint64 new_start = start - map->start_offset;
/* Move the child... */
ges_track_object_set_start (tr, start + map->start_offset);
if (new_start < 0) {
GST_ERROR ("Trying to set start to a negative value %" GST_TIME_FORMAT,
GST_TIME_ARGS (-(start + map->start_offset)));
continue;
}
ges_track_object_set_start (tr, new_start);
} else {
/* ... or update the offset */
map->start_offset = start - tr->start;
@ -1492,7 +1502,9 @@ track_object_start_changed_cb (GESTrackObject * child,
map->start_offset = object->start - child->start;
} else {
/* Or update the parent start */
object->priv->initiated_move = child;
ges_timeline_object_set_start (object, child->start + map->start_offset);
object->priv->initiated_move = NULL;
}
}