mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

TimelineObject: take a private update_height method out of priority_update_cb

Browse source
This commit is contained in:
Thibault Saunier 2011-02-01 21:14:29 +01:00 committed by Edward Hervey
parent 5ebeec2df1
commit b2d9ba6f1e
1 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@ track_object_duration_changed_cb (GESTrackObject * child,
static void static void
track_object_priority_changed_cb (GESTrackObject * child, track_object_priority_changed_cb (GESTrackObject * child,
GParamSpec * arg G_GNUC_UNUSED, GESTimelineObject * object); GParamSpec * arg G_GNUC_UNUSED, GESTimelineObject * object);
static void update_height (GESTimelineObject * object);
gint sort_track_effects (gpointer a, gpointer b, GESTimelineObject * object); gint sort_track_effects (gpointer a, gpointer b, GESTimelineObject * object);
@ -403,6 +404,8 @@ ges_timeline_object_add_track_object (GESTimelineObject * object, GESTrackObject
ges_track_object_set_priority (tmpo, tmpo->priority + 1); ges_track_object_set_priority (tmpo, tmpo->priority + 1);
ges_track_object_set_locked (tmpo, TRUE); ges_track_object_set_locked (tmpo, TRUE);
} }
update_height (object);
priv->nb_effects++; priv->nb_effects++;
} }
@ -840,6 +843,34 @@ ges_timeline_object_get_top_effect_position (GESTimelineObject * object,
GES_TRACK_OBJECT (effect))->priority_offset; GES_TRACK_OBJECT (effect))->priority_offset;
} }
static void
update_height (GESTimelineObject * object)
{
GList *tmp;
guint32 min_prio = G_MAXUINT32, max_prio = 0;
GST_DEBUG ("Updating height");
/* Go over all childs and check if height has changed */
for (tmp = object->priv->trackobjects; tmp; tmp = tmp->next) {
GESTrackObject *tmpo = (GESTrackObject *) tmp->data;
if (tmpo->priority < min_prio)
min_prio = tmpo->priority;
if (tmpo->priority > max_prio)
max_prio = tmpo->priority;
}
/* FIXME : We only grow the height */
if (object->height < (max_prio - min_prio + 1)) {
object->height = max_prio - min_prio + 1;
#if GLIB_CHECK_VERSION(2,26,0)
g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_HEIGHT]);
#else
g_object_notify (G_OBJECT (object), "height");
#endif
}
}
/* /*
* PROPERTY NOTIFICATIONS FROM TRACK OBJECTS * PROPERTY NOTIFICATIONS FROM TRACK OBJECTS
*/ */
@ -900,31 +931,11 @@ track_object_priority_changed_cb (GESTrackObject * child,
return; return;
if (!ges_track_object_is_locked (child)) { if (!ges_track_object_is_locked (child)) {
GList *tmp;
guint32 min_prio = G_MAXUINT32, max_prio = 0;
/* Update the internal priority_offset */ /* Update the internal priority_offset */
map->priority_offset = object->priority - child->priority; map->priority_offset = object->priority - child->priority;
update_height (object);
/* Go over all childs and check if height has changed */
for (tmp = object->priv->trackobjects; tmp; tmp = tmp->next) {
GESTrackObject *tmpo = (GESTrackObject *) tmp->data;
if (tmpo->priority < min_prio)
min_prio = tmpo->priority;
if (tmpo->priority > max_prio)
max_prio = tmpo->priority;
}
/* FIXME : We only grow the height */
if (object->height < (max_prio - min_prio + 1)) {
object->height = max_prio - min_prio + 1;
#if GLIB_CHECK_VERSION(2,26,0)
g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_HEIGHT]);
#else
g_object_notify (G_OBJECT (object), "height");
#endif
}
} else { } else {
/* Or update the parent priority */ /* Or update the parent priority */
ges_timeline_object_set_priority (object, ges_timeline_object_set_priority (object,