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

container: Make initiated_move a read only protected member

Browse source 
It is a interesting information for subclasses.
Conflicts:
	ges/ges-container.c
This commit is contained in:
Thibault Saunier 2013-06-25 18:32:49 -04:00 committed by Mathieu Duponchelle
parent 5a29cd0c88
commit f5aee5df57
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ges/ges-container.c
View file

@ -79,7 +79,6 @@ struct _GESContainerPrivate
GESChildrenControlMode children_control_mode; GESChildrenControlMode children_control_mode;
GHashTable *mappings; GHashTable *mappings;
guint nb_effects; guint nb_effects;
GESTimelineElement *initiated_move;
}; };
enum enum
@ -201,7 +200,7 @@ _set_inpoint (GESTimelineElement * element, GstClockTime inpoint)
GESTimelineElement *child = (GESTimelineElement *) tmp->data; GESTimelineElement *child = (GESTimelineElement *) tmp->data;
ChildMapping *map = g_hash_table_lookup (container->priv->mappings, child); ChildMapping *map = g_hash_table_lookup (container->priv->mappings, child);
if (child == container->priv->initiated_move) { if (child == container->initiated_move) {
map->inpoint_offset = inpoint - _INPOINT (child); map->inpoint_offset = inpoint - _INPOINT (child);
continue; continue;
} }
@ -227,7 +226,7 @@ _set_duration (GESTimelineElement * element, GstClockTime duration)
GESTimelineElement *child = (GESTimelineElement *) tmp->data; GESTimelineElement *child = (GESTimelineElement *) tmp->data;
ChildMapping *map = g_hash_table_lookup (priv->mappings, child); ChildMapping *map = g_hash_table_lookup (priv->mappings, child);
if (child == container->priv->initiated_move) { if (child == container->initiated_move) {
map->duration_offset = duration - _DURATION (child); map->duration_offset = duration - _DURATION (child);
continue; continue;
} }
@ -436,9 +435,9 @@ _child_start_changed_cb (GESTimelineElement * child,
"involve our start becoming < 0. In that case, undo the child move."); "involve our start becoming < 0. In that case, undo the child move.");
/* We update all the children calling our set_start method */ /* We update all the children calling our set_start method */
container->priv->initiated_move = child; container->initiated_move = child;
_set_start0 (element, _START (child) + map->start_offset); _set_start0 (element, _START (child) + map->start_offset);
container->priv->initiated_move = NULL; container->initiated_move = NULL;
} }
static void static void
@ -457,9 +456,9 @@ _child_inpoint_changed_cb (GESTimelineElement * child,
g_assert (map); g_assert (map);
/* We update all the children calling our set_inpoint method */ /* We update all the children calling our set_inpoint method */
container->priv->initiated_move = child; container->initiated_move = child;
_set_inpoint0 (element, _INPOINT (child) + map->inpoint_offset); _set_inpoint0 (element, _INPOINT (child) + map->inpoint_offset);
container->priv->initiated_move = NULL; container->initiated_move = NULL;
} }
static void static void
@ -478,9 +477,9 @@ _child_duration_changed_cb (GESTimelineElement * child,
g_assert (map); g_assert (map);
/* We update all the children calling our set_duration method */ /* We update all the children calling our set_duration method */
container->priv->initiated_move = child; container->initiated_move = child;
_set_duration0 (element, _DURATION (child) + map->duration_offset); _set_duration0 (element, _DURATION (child) + map->duration_offset);
container->priv->initiated_move = NULL; container->initiated_move = NULL;
} }
static void static void

4
ges/ges-container.h
View file

@ -83,6 +83,10 @@ struct _GESContainer
* readability purposes */ * readability purposes */
guint32 height; /* the span of priorities this object needs */ guint32 height; /* the span of priorities this object needs */
/* <protected> */
/*< readonly >*/
GESTimelineElement *initiated_move;
/*< private >*/ /*< private >*/
GESContainerPrivate *priv; GESContainerPrivate *priv;