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

GESTimelineObject: Change the get_effects method to get_top_effects.

Browse source
This commit is contained in:
Thibault Saunier 2011-02-16 17:45:05 +01:00 committed by Edward Hervey
parent 0d02e26195
commit 7f3e64bd82
4 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/libs/ges-sections.txt
View file

@ -287,7 +287,7 @@ ges_timeline_object_set_duration
ges_timeline_object_get_layer ges_timeline_object_get_layer
ges_timeline_object_find_track_object ges_timeline_object_find_track_object
ges_timeline_object_add_track_object ges_timeline_object_add_track_object
ges_timeline_object_get_effects ges_timeline_object_get_top_effects
ges_timeline_object_get_top_effect_position ges_timeline_object_get_top_effect_position
ges_timeline_object_set_top_effect_priority ges_timeline_object_set_top_effect_priority
<SUBSECTION Standard> <SUBSECTION Standard>

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

@ -849,7 +849,7 @@ sort_track_effects (gpointer a, gpointer b, GESTimelineObject * object)
} }
/** /**
* ges_timeline_object_get_effects: * ges_timeline_object_get_top_effects:
* @object: The origin #GESTimelineObject * @object: The origin #GESTimelineObject
* *
* Get effects applied on @object * Get effects applied on @object
@ -860,18 +860,18 @@ sort_track_effects (gpointer a, gpointer b, GESTimelineObject * object)
* unref each #GESTrackEffect and free the #GList. * unref each #GESTrackEffect and free the #GList.
*/ */
GList * GList *
ges_timeline_object_get_effects (GESTimelineObject * object) ges_timeline_object_get_top_effects (GESTimelineObject * object)
{ {
GList *tmp, *ret; GList *tmp, *ret;
guint i;
ret = NULL; ret = NULL;
for (tmp = object->priv->trackobjects; tmp; tmp = tmp->next) { for (tmp = object->priv->trackobjects, i = 0; i < object->priv->nb_effects;
if (GES_IS_TRACK_EFFECT (tmp->data)) { tmp = tmp->next, i++) {
ret = g_list_append (ret, tmp->data); ret = g_list_append (ret, tmp->data);
g_object_ref (tmp->data); g_object_ref (tmp->data);
} }
}
return ret; return ret;
} }

2
ges/ges-timeline-object.h
View file

@ -242,7 +242,7 @@ ges_timeline_object_add_track_object (GESTimelineObject *object, GESTrackObject
*trobj); *trobj);
GList * GList *
ges_timeline_object_get_effects (GESTimelineObject *object); ges_timeline_object_get_top_effects (GESTimelineObject *object);
gint gint
ges_timeline_object_get_top_effect_position (GESTimelineObject *object, ges_timeline_object_get_top_effect_position (GESTimelineObject *object,

9
tests/check/ges/effects.c
View file

@ -141,7 +141,8 @@ GST_START_TEST (test_get_effects_from_tl)
g_object_get (G_OBJECT (source), "height", &tl_object_height, NULL); g_object_get (G_OBJECT (source), "height", &tl_object_height, NULL);
fail_unless (tl_object_height == 4); fail_unless (tl_object_height == 4);
effects = ges_timeline_object_get_effects (GES_TIMELINE_OBJECT (source)); effects = ges_timeline_object_get_top_effects (GES_TIMELINE_OBJECT (source));
fail_unless (g_list_length (effects) == 3);
for (tmp = effects; tmp; tmp = tmp->next) { for (tmp = effects; tmp; tmp = tmp->next) {
gint priority = gint priority =
ges_timeline_object_get_top_effect_position (GES_TIMELINE_OBJECT ges_timeline_object_get_top_effect_position (GES_TIMELINE_OBJECT
@ -215,7 +216,8 @@ GST_START_TEST (test_tl_effect)
g_object_get (tl_effect, "height", &tl_object_height, NULL); g_object_get (tl_effect, "height", &tl_object_height, NULL);
fail_unless (tl_object_height == 4); fail_unless (tl_object_height == 4);
effects = ges_timeline_object_get_effects (GES_TIMELINE_OBJECT (tl_effect)); effects =
ges_timeline_object_get_top_effects (GES_TIMELINE_OBJECT (tl_effect));
for (tmp = effects, i = 0; tmp; tmp = tmp->next, i++) { for (tmp = effects, i = 0; tmp; tmp = tmp->next, i++) {
gint priority = gint priority =
ges_timeline_object_get_top_effect_position (GES_TIMELINE_OBJECT ges_timeline_object_get_top_effect_position (GES_TIMELINE_OBJECT
@ -297,7 +299,8 @@ GST_START_TEST (test_priorities_tl_object)
g_object_get (tl_effect, "height", &tl_object_height, NULL); g_object_get (tl_effect, "height", &tl_object_height, NULL);
fail_unless (tl_object_height == 4); fail_unless (tl_object_height == 4);
effects = ges_timeline_object_get_effects (GES_TIMELINE_OBJECT (tl_effect)); effects =
ges_timeline_object_get_top_effects (GES_TIMELINE_OBJECT (tl_effect));
for (tmp = effects, i = 0; tmp; tmp = tmp->next, i++) { for (tmp = effects, i = 0; tmp; tmp = tmp->next, i++) {
gint priority = gint priority =
ges_timeline_object_get_top_effect_position (GES_TIMELINE_OBJECT ges_timeline_object_get_top_effect_position (GES_TIMELINE_OBJECT