mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 05:35:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

container: Add a 'recursive' argument to the get_children method

Browse source 
API:
  - ges_container_get_children (GESContainer *container);
  + ges_container_get_children (GESContainer *container, gboolean recurse);
This commit is contained in:
Mathieu Duponchelle 2013-07-10 21:24:28 +02:00 committed by Thibault Saunier
parent ff21ea7f92
commit 96204ac1d2
5 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ges/ges-clip.c
View file

@ -383,7 +383,7 @@ _ungroup (GESContainer * container, gboolean recursive)
}
/* We need a copy of the current list of tracks */
children = ges_container_get_children (container);
children = ges_container_get_children (container, FALSE);
for (tmp = children; tmp; tmp = tmp->next) {
track_element = GES_TRACK_ELEMENT (tmp->data);
track_type = ges_track_element_get_track_type (track_element);
@ -546,7 +546,7 @@ _group (GList * containers)
supported_formats = GES_CLIP (ret)->priv->supportedformats;
for (tmpclip = containers->next; tmpclip; tmpclip = tmpclip->next) {
GESClip *cclip = tmpclip->data;
GList *children = ges_container_get_children (GES_CONTAINER (cclip));
GList *children = ges_container_get_children (GES_CONTAINER (cclip), FALSE);
for (tmpelement = children; tmpelement; tmpelement = tmpelement->next) {
GESTimelineElement *celement = GES_TIMELINE_ELEMENT (tmpelement->data);

30
ges/ges-container.c
View file

@ -564,9 +564,27 @@ ges_container_remove (GESContainer * container, GESTimelineElement * child)
return TRUE;
}
static void
_get_children_recursively (GESContainer * container, GList ** children)
{
GList *tmp;
*children =
g_list_concat (*children, g_list_copy_deep (container->children,
(GCopyFunc) gst_object_ref, NULL));
for (tmp = container->children; tmp; tmp = tmp->next) {
GESTimelineElement *element = tmp->data;
if (GES_IS_CONTAINER (element))
_get_children_recursively (tmp->data, children);
}
}
/**
* ges_container_get_children:
* @container: a #GESContainer
* @recursive: Whether to recursively get children in @container
*
* Get the list of #GESTimelineElement contained in @container
* The user is responsible for unreffing the contained objects
@ -576,12 +594,18 @@ ges_container_remove (GESContainer * container, GESTimelineElement * child)
* timeline element contained in @container.
*/
GList *
ges_container_get_children (GESContainer * container)
ges_container_get_children (GESContainer * container, gboolean recursive)
{
GList *children = NULL;
g_return_val_if_fail (GES_IS_CONTAINER (container), NULL);
return g_list_copy_deep (container->children, (GCopyFunc) gst_object_ref,
NULL);
if (!recursive)
return g_list_copy_deep (container->children, (GCopyFunc) gst_object_ref,
NULL);
_get_children_recursively (container, &children);
return children;
}
/**

2
ges/ges-container.h
View file

@ -137,7 +137,7 @@ struct _GESContainerClass
GType ges_container_get_type (void);
/* Children handling */
GList* ges_container_get_children (GESContainer *container);
GList* ges_container_get_children (GESContainer *container, gboolean recursive);
gboolean ges_container_add (GESContainer *container, GESTimelineElement *child);
gboolean ges_container_remove (GESContainer *container, GESTimelineElement *child);
GList * ges_container_ungroup (GESContainer * container, gboolean recursive);

2
ges/ges-group.c
View file

@ -450,7 +450,7 @@ _ungroup (GESContainer * group, gboolean recursive)
{
GList *children, *tmp, *ret = NULL;
children = ges_container_get_children (group);
children = ges_container_get_children (group, FALSE);
for (tmp = children; tmp; tmp = tmp->next) {
GESTimelineElement *child = tmp->data;

2
ges/ges-timeline.c
View file

@ -2014,7 +2014,7 @@ layer_object_removed_cb (GESLayer * layer, GESClip * clip,
/* Go over the clip's track element and figure out which one belongs to
* the list of tracks we control */
trackelements = ges_container_get_children (GES_CONTAINER (clip));
trackelements = ges_container_get_children (GES_CONTAINER (clip), FALSE);
for (tmp = trackelements; tmp; tmp = tmp->next) {
GESTrackElement *track_element = (GESTrackElement *) tmp->data;
GESTrack *track = ges_track_element_get_track (track_element);