mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

Rename GESTimelineLayer.xxx_object to GESTimelineLayer.xxx_clip

Browse source
This commit is contained in:
Thibault Saunier 2013-02-08 17:25:25 -03:00
parent ec1db99266
commit d21791a8d0
27 changed files with 129 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -290,13 +290,13 @@ GES_TYPE_TIMELINE
<TITLE>GESTimelineLayer</TITLE> <TITLE>GESTimelineLayer</TITLE>
GESTimelineLayer GESTimelineLayer
GESTimelineLayerClass GESTimelineLayerClass
ges_timeline_layer_add_object ges_timeline_layer_add_clip
ges_timeline_layer_add_asset ges_timeline_layer_add_asset
ges_timeline_layer_new ges_timeline_layer_new
ges_timeline_layer_remove_object ges_timeline_layer_remove_clip
ges_timeline_layer_set_priority ges_timeline_layer_set_priority
ges_timeline_layer_get_priority ges_timeline_layer_get_priority
ges_timeline_layer_get_objects ges_timeline_layer_get_clips
ges_timeline_layer_get_timeline ges_timeline_layer_get_timeline
ges_timeline_layer_get_auto_transition ges_timeline_layer_get_auto_transition
ges_timeline_layer_set_auto_transition ges_timeline_layer_set_auto_transition

8
ges/ges-clip.c
View file

@ -898,7 +898,7 @@ ges_clip_move_to_layer (GESClip * object, GESTimelineLayer * layer)
if (current_layer == NULL) { if (current_layer == NULL) {
GST_DEBUG ("Not moving %p, only adding it to %p", object, layer); GST_DEBUG ("Not moving %p, only adding it to %p", object, layer);
return ges_timeline_layer_add_object (layer, object); return ges_timeline_layer_add_clip (layer, object);
} }
GST_DEBUG_OBJECT (object, "moving to layer %p, priority: %d", layer, GST_DEBUG_OBJECT (object, "moving to layer %p, priority: %d", layer,
@ -906,14 +906,14 @@ ges_clip_move_to_layer (GESClip * object, GESTimelineLayer * layer)
object->priv->is_moving = TRUE; object->priv->is_moving = TRUE;
g_object_ref (object); g_object_ref (object);
ret = ges_timeline_layer_remove_object (current_layer, object); ret = ges_timeline_layer_remove_clip (current_layer, object);
if (!ret) { if (!ret) {
g_object_unref (object); g_object_unref (object);
return FALSE; return FALSE;
} }
ret = ges_timeline_layer_add_object (layer, object); ret = ges_timeline_layer_add_clip (layer, object);
object->priv->is_moving = FALSE; object->priv->is_moving = FALSE;
g_object_unref (object); g_object_unref (object);
@ -1271,7 +1271,7 @@ ges_clip_split (GESClip * object, guint64 position)
if (object->priv->layer) { if (object->priv->layer) {
/* We do not want the timeline to create again TrackElement-s */ /* We do not want the timeline to create again TrackElement-s */
ges_clip_set_moving_from_layer (new_object, TRUE); ges_clip_set_moving_from_layer (new_object, TRUE);
ges_timeline_layer_add_object (object->priv->layer, new_object); ges_timeline_layer_add_clip (object->priv->layer, new_object);
ges_clip_set_moving_from_layer (new_object, FALSE); ges_clip_set_moving_from_layer (new_object, FALSE);
} }

4
ges/ges-pitivi-formatter.c
View file

@ -365,7 +365,7 @@ save_sources (GESPitiviFormatter * formatter, GList * layers,
for (tmplayer = layers; tmplayer; tmplayer = tmplayer->next) { for (tmplayer = layers; tmplayer; tmplayer = tmplayer->next) {
layer = GES_TIMELINE_LAYER (tmplayer->data); layer = GES_TIMELINE_LAYER (tmplayer->data);
clips = ges_timeline_layer_get_objects (layer); clips = ges_timeline_layer_get_clips (layer);
for (tmp = clips; tmp; tmp = tmp->next) { for (tmp = clips; tmp; tmp = tmp->next) {
SrcMapping *srcmap = g_slice_new0 (SrcMapping); SrcMapping *srcmap = g_slice_new0 (SrcMapping);
GESClip *clip; GESClip *clip;
@ -920,7 +920,7 @@ make_source (GESFormatter * self, GList * reflist, GHashTable * source_table)
} }
set_properties (G_OBJECT (src), props_table); set_properties (G_OBJECT (src), props_table);
ges_timeline_layer_add_object (layer, GES_CLIP (src)); ges_timeline_layer_add_clip (layer, GES_CLIP (src));
g_signal_connect (src, "track-element-added", g_signal_connect (src, "track-element-added",
G_CALLBACK (track_element_added_cb), props_table); G_CALLBACK (track_element_added_cb), props_table);

2
ges/ges-simple-timeline-layer.c
View file

@ -327,7 +327,7 @@ ges_simple_timeline_layer_add_object (GESSimpleTimelineLayer * layer,
/* provisionally insert the object */ /* provisionally insert the object */
priv->objects = g_list_insert (priv->objects, object, position); priv->objects = g_list_insert (priv->objects, object, position);
res = ges_timeline_layer_add_object ((GESTimelineLayer *) layer, object); res = ges_timeline_layer_add_clip ((GESTimelineLayer *) layer, object);
/* Add to layer */ /* Add to layer */
if (G_UNLIKELY (!res)) { if (G_UNLIKELY (!res)) {

18
ges/ges-timeline-layer.c
View file

@ -124,7 +124,7 @@ ges_timeline_layer_dispose (GObject * object)
GST_DEBUG ("Disposing layer"); GST_DEBUG ("Disposing layer");
while (priv->objects_start) while (priv->objects_start)
ges_timeline_layer_remove_object (layer, ges_timeline_layer_remove_clip (layer,
(GESClip *) priv->objects_start->data); (GESClip *) priv->objects_start->data);
G_OBJECT_CLASS (ges_timeline_layer_parent_class)->dispose (object); G_OBJECT_CLASS (ges_timeline_layer_parent_class)->dispose (object);
@ -269,7 +269,7 @@ new_asset_cb (GESAsset * source, GAsyncResult * res, NewAssetUData * udata)
ges_extractable_set_asset (GES_EXTRACTABLE (udata->object), asset); ges_extractable_set_asset (GES_EXTRACTABLE (udata->object), asset);
ges_project_add_asset (project, asset); ges_project_add_asset (project, asset);
ges_timeline_layer_add_object (udata->layer, udata->object); ges_timeline_layer_add_clip (udata->layer, udata->object);
} }
g_object_unref (asset); g_object_unref (asset);
@ -278,7 +278,7 @@ new_asset_cb (GESAsset * source, GAsyncResult * res, NewAssetUData * udata)
/* Public methods */ /* Public methods */
/** /**
* ges_timeline_layer_remove_object: * ges_timeline_layer_remove_clip:
* @layer: a #GESTimelineLayer * @layer: a #GESTimelineLayer
* @object: the #GESClip to remove * @object: the #GESClip to remove
* *
@ -291,7 +291,7 @@ new_asset_cb (GESAsset * source, GAsyncResult * res, NewAssetUData * udata)
* not want to remove the object. * not want to remove the object.
*/ */
gboolean gboolean
ges_timeline_layer_remove_object (GESTimelineLayer * layer, GESClip * object) ges_timeline_layer_remove_clip (GESTimelineLayer * layer, GESClip * object)
{ {
GESTimelineLayer *current_layer; GESTimelineLayer *current_layer;
@ -404,7 +404,7 @@ ges_timeline_layer_get_priority (GESTimelineLayer * layer)
} }
/** /**
* ges_timeline_layer_get_objects: * ges_timeline_layer_get_clips:
* @layer: a #GESTimelineLayer * @layer: a #GESTimelineLayer
* *
* Get the clips this layer contains. * Get the clips this layer contains.
@ -415,7 +415,7 @@ ges_timeline_layer_get_priority (GESTimelineLayer * layer)
*/ */
GList * GList *
ges_timeline_layer_get_objects (GESTimelineLayer * layer) ges_timeline_layer_get_clips (GESTimelineLayer * layer)
{ {
GESTimelineLayerClass *klass; GESTimelineLayerClass *klass;
@ -451,7 +451,7 @@ ges_timeline_layer_is_empty (GESTimelineLayer * layer)
} }
/** /**
* ges_timeline_layer_add_object: * ges_timeline_layer_add_clip:
* @layer: a #GESTimelineLayer * @layer: a #GESTimelineLayer
* @object: (transfer full): the #GESClip to add. * @object: (transfer full): the #GESClip to add.
* *
@ -469,7 +469,7 @@ ges_timeline_layer_is_empty (GESTimelineLayer * layer)
* if the @layer refuses to add the object. * if the @layer refuses to add the object.
*/ */
gboolean gboolean
ges_timeline_layer_add_object (GESTimelineLayer * layer, GESClip * object) ges_timeline_layer_add_clip (GESTimelineLayer * layer, GESClip * object)
{ {
GESAsset *asset; GESAsset *asset;
GESTimelineLayerPrivate *priv; GESTimelineLayerPrivate *priv;
@ -604,7 +604,7 @@ ges_timeline_layer_add_asset (GESTimelineLayer * layer,
_set_duration0 (GES_TIMELINE_ELEMENT (clip), duration); _set_duration0 (GES_TIMELINE_ELEMENT (clip), duration);
} }
if (!ges_timeline_layer_add_object (layer, clip)) { if (!ges_timeline_layer_add_clip (layer, clip)) {
gst_object_unref (clip); gst_object_unref (clip);
return NULL; return NULL;

6
ges/ges-timeline-layer.h
View file

@ -99,7 +99,7 @@ void ges_timeline_layer_set_timeline (GESTimelineLayer * layer,
GESTimeline * GESTimeline *
ges_timeline_layer_get_timeline (GESTimelineLayer * layer); ges_timeline_layer_get_timeline (GESTimelineLayer * layer);
gboolean ges_timeline_layer_add_object (GESTimelineLayer * layer, gboolean ges_timeline_layer_add_clip (GESTimelineLayer * layer,
GESClip * object); GESClip * object);
GESClip * ges_timeline_layer_add_asset (GESTimelineLayer *layer, GESClip * ges_timeline_layer_add_asset (GESTimelineLayer *layer,
@ -110,7 +110,7 @@ GESClip * ges_timeline_layer_add_asset (GESTimelineLayer *layer,
gdouble rate, gdouble rate,
GESTrackType track_types); GESTrackType track_types);
gboolean ges_timeline_layer_remove_object (GESTimelineLayer * layer, gboolean ges_timeline_layer_remove_clip (GESTimelineLayer * layer,
GESClip * object); GESClip * object);
void ges_timeline_layer_set_priority (GESTimelineLayer * layer, void ges_timeline_layer_set_priority (GESTimelineLayer * layer,
@ -125,7 +125,7 @@ gboolean ges_timeline_layer_get_auto_transition (GESTimelineLayer * layer);
void ges_timeline_layer_set_auto_transition (GESTimelineLayer * layer, void ges_timeline_layer_set_auto_transition (GESTimelineLayer * layer,
gboolean auto_transition); gboolean auto_transition);
GList* ges_timeline_layer_get_objects (GESTimelineLayer * layer); GList* ges_timeline_layer_get_clips (GESTimelineLayer * layer);
G_END_DECLS G_END_DECLS

8
ges/ges-timeline.c
View file

@ -656,7 +656,7 @@ _destroy_auto_transition_cb (GESAutoTransition * auto_transition,
GESClip *transition = auto_transition->transition_clip; GESClip *transition = auto_transition->transition_clip;
GESTimelineLayer *layer = ges_clip_get_layer (transition); GESTimelineLayer *layer = ges_clip_get_layer (transition);
ges_timeline_layer_remove_object (layer, transition); ges_timeline_layer_remove_clip (layer, transition);
g_signal_handlers_disconnect_by_func (auto_transition, g_signal_handlers_disconnect_by_func (auto_transition,
_destroy_auto_transition_cb, timeline); _destroy_auto_transition_cb, timeline);
@ -2295,7 +2295,7 @@ ges_timeline_add_layer (GESTimeline * timeline, GESTimelineLayer * layer)
g_signal_emit (timeline, ges_timeline_signals[LAYER_ADDED], 0, layer); g_signal_emit (timeline, ges_timeline_signals[LAYER_ADDED], 0, layer);
/* add any existing clips to the timeline */ /* add any existing clips to the timeline */
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
for (tmp = objects; tmp; tmp = tmp->next) { for (tmp = objects; tmp; tmp = tmp->next) {
layer_object_added_cb (layer, tmp->data, timeline); layer_object_added_cb (layer, tmp->data, timeline);
g_object_unref (tmp->data); g_object_unref (tmp->data);
@ -2332,7 +2332,7 @@ ges_timeline_remove_layer (GESTimeline * timeline, GESTimelineLayer * layer)
/* remove objects from any private data structures */ /* remove objects from any private data structures */
layer_objects = ges_timeline_layer_get_objects (layer); layer_objects = ges_timeline_layer_get_clips (layer);
for (tmp = layer_objects; tmp; tmp = tmp->next) { for (tmp = layer_objects; tmp; tmp = tmp->next) {
layer_object_removed_cb (layer, GES_CLIP (tmp->data), timeline); layer_object_removed_cb (layer, GES_CLIP (tmp->data), timeline);
g_object_unref (G_OBJECT (tmp->data)); g_object_unref (G_OBJECT (tmp->data));
@ -2429,7 +2429,7 @@ ges_timeline_add_track (GESTimeline * timeline, GESTrack * track)
for (tmp = timeline->layers; tmp; tmp = tmp->next) { for (tmp = timeline->layers; tmp; tmp = tmp->next) {
GList *objects, *obj; GList *objects, *obj;
objects = ges_timeline_layer_get_objects (tmp->data); objects = ges_timeline_layer_get_clips (tmp->data);
for (obj = objects; obj; obj = obj->next) { for (obj = objects; obj; obj = obj->next) {
GESClip *object = obj->data; GESClip *object = obj->data;

2
ges/ges-xml-formatter.c
View file

@ -850,7 +850,7 @@ _save_layers (GString * str, GESTimeline * timeline)
g_free (properties); g_free (properties);
g_free (metas); g_free (metas);
clips = ges_timeline_layer_get_objects (layer); clips = ges_timeline_layer_get_clips (layer);
for (tmpclip = clips; tmpclip; tmpclip = tmpclip->next) { for (tmpclip = clips; tmpclip; tmpclip = tmpclip->next) {
GList *effects, *tmpeffect; GList *effects, *tmpeffect;

2
tests/check/ges/backgroundsource.c
View file

@ -177,7 +177,7 @@ GST_START_TEST (test_test_source_in_layer)
g_object_unref (trobj); g_object_unref (trobj);
ges_timeline_layer_remove_object (layer, (GESClip *) source); ges_timeline_layer_remove_clip (layer, (GESClip *) source);
GST_DEBUG ("removing the layer"); GST_DEBUG ("removing the layer");

28
tests/check/ges/basic.c
View file

@ -102,7 +102,7 @@ GST_START_TEST (test_ges_scenario)
/* The source will be floating before added to the layer... */ /* The source will be floating before added to the layer... */
fail_unless (g_object_is_floating (source)); fail_unless (g_object_is_floating (source));
GST_DEBUG ("Adding the source to the timeline layer"); GST_DEBUG ("Adding the source to the timeline layer");
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (source))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (source)));
fail_if (g_object_is_floating (source)); fail_if (g_object_is_floating (source));
tmp_layer = ges_clip_get_layer (GES_CLIP (source)); tmp_layer = ges_clip_get_layer (GES_CLIP (source));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
@ -136,7 +136,7 @@ GST_START_TEST (test_ges_scenario)
/* Now remove the clip */ /* Now remove the clip */
g_object_ref (source); g_object_ref (source);
ASSERT_OBJECT_REFCOUNT (layer, "layer", 1); ASSERT_OBJECT_REFCOUNT (layer, "layer", 1);
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (source))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (source)));
ASSERT_OBJECT_REFCOUNT (source, "source", 1); ASSERT_OBJECT_REFCOUNT (source, "source", 1);
ASSERT_OBJECT_REFCOUNT (layer, "layer", 1); ASSERT_OBJECT_REFCOUNT (layer, "layer", 1);
tmp_layer = ges_clip_get_layer (GES_CLIP (source)); tmp_layer = ges_clip_get_layer (GES_CLIP (source));
@ -213,7 +213,7 @@ GST_START_TEST (test_ges_timeline_add_layer)
GST_DEBUG ("Creating a source"); GST_DEBUG ("Creating a source");
s1 = ges_custom_source_clip_new (my_fill_track_func, NULL); s1 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s1 != NULL); fail_unless (s1 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s1))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (s1)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s1)); tmp_layer = ges_clip_get_layer (GES_CLIP (s1));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
ASSERT_OBJECT_REFCOUNT (layer, "layer", 2); ASSERT_OBJECT_REFCOUNT (layer, "layer", 2);
@ -222,7 +222,7 @@ GST_START_TEST (test_ges_timeline_add_layer)
GST_DEBUG ("Creating a source"); GST_DEBUG ("Creating a source");
s2 = ges_custom_source_clip_new (my_fill_track_func, NULL); s2 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s2 != NULL); fail_unless (s2 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s2))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (s2)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s2)); tmp_layer = ges_clip_get_layer (GES_CLIP (s2));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
ASSERT_OBJECT_REFCOUNT (layer, "layer", 2); ASSERT_OBJECT_REFCOUNT (layer, "layer", 2);
@ -231,7 +231,7 @@ GST_START_TEST (test_ges_timeline_add_layer)
GST_DEBUG ("Creating a source"); GST_DEBUG ("Creating a source");
s3 = ges_custom_source_clip_new (my_fill_track_func, NULL); s3 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s3 != NULL); fail_unless (s3 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s3))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (s3)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s3)); tmp_layer = ges_clip_get_layer (GES_CLIP (s3));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
ASSERT_OBJECT_REFCOUNT (layer, "layer", 2); ASSERT_OBJECT_REFCOUNT (layer, "layer", 2);
@ -328,7 +328,7 @@ GST_START_TEST (test_ges_timeline_add_layer_first)
GST_DEBUG ("Creating a source"); GST_DEBUG ("Creating a source");
s1 = ges_custom_source_clip_new (my_fill_track_func, NULL); s1 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s1 != NULL); fail_unless (s1 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s1))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (s1)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s1)); tmp_layer = ges_clip_get_layer (GES_CLIP (s1));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
g_object_unref (tmp_layer); g_object_unref (tmp_layer);
@ -336,7 +336,7 @@ GST_START_TEST (test_ges_timeline_add_layer_first)
GST_DEBUG ("Creating a source"); GST_DEBUG ("Creating a source");
s2 = ges_custom_source_clip_new (my_fill_track_func, NULL); s2 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s2 != NULL); fail_unless (s2 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s2))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (s2)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s2)); tmp_layer = ges_clip_get_layer (GES_CLIP (s2));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
g_object_unref (tmp_layer); g_object_unref (tmp_layer);
@ -344,7 +344,7 @@ GST_START_TEST (test_ges_timeline_add_layer_first)
GST_DEBUG ("Creating a source"); GST_DEBUG ("Creating a source");
s3 = ges_custom_source_clip_new (my_fill_track_func, NULL); s3 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s3 != NULL); fail_unless (s3 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s3))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (s3)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s3)); tmp_layer = ges_clip_get_layer (GES_CLIP (s3));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
g_object_unref (tmp_layer); g_object_unref (tmp_layer);
@ -439,7 +439,7 @@ GST_START_TEST (test_ges_timeline_remove_track)
GST_DEBUG ("Creating a source"); GST_DEBUG ("Creating a source");
s1 = ges_custom_source_clip_new (my_fill_track_func, NULL); s1 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s1 != NULL); fail_unless (s1 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s1))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (s1)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s1)); tmp_layer = ges_clip_get_layer (GES_CLIP (s1));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
g_object_unref (tmp_layer); g_object_unref (tmp_layer);
@ -447,7 +447,7 @@ GST_START_TEST (test_ges_timeline_remove_track)
GST_DEBUG ("Creating a source"); GST_DEBUG ("Creating a source");
s2 = ges_custom_source_clip_new (my_fill_track_func, NULL); s2 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s2 != NULL); fail_unless (s2 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s2))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (s2)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s2)); tmp_layer = ges_clip_get_layer (GES_CLIP (s2));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
g_object_unref (tmp_layer); g_object_unref (tmp_layer);
@ -455,7 +455,7 @@ GST_START_TEST (test_ges_timeline_remove_track)
GST_DEBUG ("Creating a source"); GST_DEBUG ("Creating a source");
s3 = ges_custom_source_clip_new (my_fill_track_func, NULL); s3 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s3 != NULL); fail_unless (s3 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s3))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (s3)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s3)); tmp_layer = ges_clip_get_layer (GES_CLIP (s3));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
g_object_unref (tmp_layer); g_object_unref (tmp_layer);
@ -626,7 +626,7 @@ GST_START_TEST (test_ges_timeline_multiple_tracks)
GST_DEBUG ("Creating a source"); GST_DEBUG ("Creating a source");
s1 = ges_custom_source_clip_new (my_fill_track_func, NULL); s1 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s1 != NULL); fail_unless (s1 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s1))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (s1)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s1)); tmp_layer = ges_clip_get_layer (GES_CLIP (s1));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
g_object_unref (tmp_layer); g_object_unref (tmp_layer);
@ -634,7 +634,7 @@ GST_START_TEST (test_ges_timeline_multiple_tracks)
GST_DEBUG ("Creating a source"); GST_DEBUG ("Creating a source");
s2 = ges_custom_source_clip_new (my_fill_track_func, NULL); s2 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s2 != NULL); fail_unless (s2 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s2))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (s2)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s2)); tmp_layer = ges_clip_get_layer (GES_CLIP (s2));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
g_object_unref (tmp_layer); g_object_unref (tmp_layer);
@ -642,7 +642,7 @@ GST_START_TEST (test_ges_timeline_multiple_tracks)
GST_DEBUG ("Creating a source"); GST_DEBUG ("Creating a source");
s3 = ges_custom_source_clip_new (my_fill_track_func, NULL); s3 = ges_custom_source_clip_new (my_fill_track_func, NULL);
fail_unless (s3 != NULL); fail_unless (s3 != NULL);
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (s3))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (s3)));
tmp_layer = ges_clip_get_layer (GES_CLIP (s3)); tmp_layer = ges_clip_get_layer (GES_CLIP (s3));
fail_unless (tmp_layer == layer); fail_unless (tmp_layer == layer);
g_object_unref (tmp_layer); g_object_unref (tmp_layer);

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

@ -79,7 +79,7 @@ GST_START_TEST (test_add_effect_to_clip)
assert_equals_int (GES_TRACK_ELEMENT (base_effect)->active, TRUE); assert_equals_int (GES_TRACK_ELEMENT (base_effect)->active, TRUE);
ges_timeline_layer_remove_object (layer, (GESClip *) source); ges_timeline_layer_remove_clip (layer, (GESClip *) source);
g_object_unref (timeline); g_object_unref (timeline);
} }
@ -154,7 +154,7 @@ GST_START_TEST (test_get_effects_from_tl)
} }
g_list_free (effects); g_list_free (effects);
ges_timeline_layer_remove_object (layer, (GESClip *) source); ges_timeline_layer_remove_clip (layer, (GESClip *) source);
g_object_unref (timeline); g_object_unref (timeline);
} }
@ -228,7 +228,7 @@ GST_START_TEST (test_effect_clip)
} }
g_list_free (effects); g_list_free (effects);
ges_timeline_layer_remove_object (layer, (GESClip *) effect_clip); ges_timeline_layer_remove_clip (layer, (GESClip *) effect_clip);
g_object_unref (timeline); g_object_unref (timeline);
} }
@ -304,7 +304,7 @@ GST_START_TEST (test_priorities_clip)
} }
g_list_free (effects); g_list_free (effects);
ges_timeline_layer_remove_object (layer, (GESClip *) effect_clip); ges_timeline_layer_remove_clip (layer, (GESClip *) effect_clip);
g_object_unref (timeline); g_object_unref (timeline);
} }
@ -375,7 +375,7 @@ GST_START_TEST (test_base_effect_set_properties)
} }
g_free (pspecs); g_free (pspecs);
ges_timeline_layer_remove_object (layer, (GESClip *) effect_clip); ges_timeline_layer_remove_clip (layer, (GESClip *) effect_clip);
g_object_unref (timeline); g_object_unref (timeline);
} }
@ -444,7 +444,7 @@ GST_START_TEST (test_clip_signals)
fail_unless (G_VALUE_HOLDS_UINT (&val)); fail_unless (G_VALUE_HOLDS_UINT (&val));
g_value_unset (&val); g_value_unset (&val);
ges_timeline_layer_remove_object (layer, (GESClip *) effect_clip); ges_timeline_layer_remove_clip (layer, (GESClip *) effect_clip);
g_object_unref (timeline); g_object_unref (timeline);
} }

84
tests/check/ges/layer.c
View file

@ -82,7 +82,7 @@ GST_START_TEST (test_layer_properties)
/* Add the object to the timeline */ /* Add the object to the timeline */
fail_unless (g_object_is_floating (object)); fail_unless (g_object_is_floating (object));
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (object))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (object)));
fail_if (g_object_is_floating (object)); fail_if (g_object_is_floating (object));
trackelement = ges_clip_find_track_element (object, track, G_TYPE_NONE); trackelement = ges_clip_find_track_element (object, track, G_TYPE_NONE);
fail_unless (trackelement != NULL); fail_unless (trackelement != NULL);
@ -117,7 +117,7 @@ GST_START_TEST (test_layer_properties)
51, 0, TRUE); 51, 0, TRUE);
g_object_unref (trackelement); g_object_unref (trackelement);
fail_unless (ges_timeline_layer_remove_object (layer, object)); fail_unless (ges_timeline_layer_remove_clip (layer, object));
fail_unless (ges_timeline_remove_track (timeline, track)); fail_unless (ges_timeline_remove_track (timeline, track));
fail_unless (ges_timeline_remove_layer (timeline, layer)); fail_unless (ges_timeline_remove_layer (timeline, layer));
g_object_unref (timeline); g_object_unref (timeline);
@ -180,15 +180,15 @@ GST_START_TEST (test_layer_priorities)
assert_equals_int (_PRIORITY (object3), LAYER_HEIGHT + 1); assert_equals_int (_PRIORITY (object3), LAYER_HEIGHT + 1);
/* Add objects to the timeline */ /* Add objects to the timeline */
fail_unless (ges_timeline_layer_add_object (layer1, object1)); fail_unless (ges_timeline_layer_add_clip (layer1, object1));
trackelement1 = ges_clip_find_track_element (object1, track, G_TYPE_NONE); trackelement1 = ges_clip_find_track_element (object1, track, G_TYPE_NONE);
fail_unless (trackelement1 != NULL); fail_unless (trackelement1 != NULL);
fail_unless (ges_timeline_layer_add_object (layer2, object2)); fail_unless (ges_timeline_layer_add_clip (layer2, object2));
trackelement2 = ges_clip_find_track_element (object2, track, G_TYPE_NONE); trackelement2 = ges_clip_find_track_element (object2, track, G_TYPE_NONE);
fail_unless (trackelement2 != NULL); fail_unless (trackelement2 != NULL);
fail_unless (ges_timeline_layer_add_object (layer3, object3)); fail_unless (ges_timeline_layer_add_clip (layer3, object3));
trackelement3 = ges_clip_find_track_element (object3, track, G_TYPE_NONE); trackelement3 = ges_clip_find_track_element (object3, track, G_TYPE_NONE);
fail_unless (trackelement3 != NULL); fail_unless (trackelement3 != NULL);
@ -236,10 +236,10 @@ GST_START_TEST (test_layer_priorities)
fail_unless (ges_clip_move_to_layer (object2, layer1)); fail_unless (ges_clip_move_to_layer (object2, layer1));
fail_unless (ges_clip_move_to_layer (object3, layer1)); fail_unless (ges_clip_move_to_layer (object3, layer1));
objs = ges_timeline_layer_get_objects (layer1); objs = ges_timeline_layer_get_clips (layer1);
assert_equals_int (g_list_length (objs), 3); assert_equals_int (g_list_length (objs), 3);
fail_unless (ges_timeline_layer_get_objects (layer2) == NULL); fail_unless (ges_timeline_layer_get_clips (layer2) == NULL);
fail_unless (ges_timeline_layer_get_objects (layer3) == NULL); fail_unless (ges_timeline_layer_get_clips (layer3) == NULL);
for (tmp = objs; tmp; tmp = g_list_next (tmp)) { for (tmp = objs; tmp; tmp = g_list_next (tmp)) {
g_object_unref (tmp->data); g_object_unref (tmp->data);
@ -327,7 +327,7 @@ GST_START_TEST (test_single_layer_automatic_transition)
assert_equals_uint64 (_DURATION (src1), 1500 - 500); assert_equals_uint64 (_DURATION (src1), 1500 - 500);
GST_DEBUG ("Checking that a transition has been added"); GST_DEBUG ("Checking that a transition has been added");
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 4); assert_equals_int (g_list_length (objects), 4);
assert_is_type (objects->data, GES_TYPE_TEST_CLIP); assert_is_type (objects->data, GES_TYPE_TEST_CLIP);
@ -357,7 +357,7 @@ GST_START_TEST (test_single_layer_automatic_transition)
assert_equals_uint64 (_START (src1), 500); assert_equals_uint64 (_START (src1), 500);
assert_equals_uint64 (_DURATION (src1), 1500 - 500); assert_equals_uint64 (_DURATION (src1), 1500 - 500);
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 4); assert_equals_int (g_list_length (objects), 4);
assert_is_type (objects->data, GES_TYPE_TEST_CLIP); assert_is_type (objects->data, GES_TYPE_TEST_CLIP);
@ -385,7 +385,7 @@ GST_START_TEST (test_single_layer_automatic_transition)
assert_equals_uint64 (_START (src1), 250); assert_equals_uint64 (_START (src1), 250);
assert_equals_uint64 (_DURATION (src1), 1250 - 250); assert_equals_uint64 (_DURATION (src1), 1250 - 250);
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 2); assert_equals_int (g_list_length (objects), 2);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
@ -403,7 +403,7 @@ GST_START_TEST (test_single_layer_automatic_transition)
assert_equals_uint64 (_START (src1), 500); assert_equals_uint64 (_START (src1), 500);
assert_equals_uint64 (_DURATION (src1), 1250 - 500); assert_equals_uint64 (_DURATION (src1), 1250 - 500);
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 2); assert_equals_int (g_list_length (objects), 2);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
@ -431,11 +431,11 @@ GST_START_TEST (test_single_layer_automatic_transition)
assert_equals_uint64 (_START (src1), 500); assert_equals_uint64 (_START (src1), 500);
assert_equals_uint64 (_DURATION (src1), 1250 - 500); assert_equals_uint64 (_DURATION (src1), 1250 - 500);
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 2); assert_equals_int (g_list_length (objects), 2);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 2); assert_equals_int (g_list_length (objects), 2);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
@ -451,11 +451,11 @@ GST_START_TEST (test_single_layer_automatic_transition)
assert_equals_uint64 (_START (src1), 500); assert_equals_uint64 (_START (src1), 500);
assert_equals_uint64 (_DURATION (src1), 1250 - 500); assert_equals_uint64 (_DURATION (src1), 1250 - 500);
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 2); assert_equals_int (g_list_length (objects), 2);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 2); assert_equals_int (g_list_length (objects), 2);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
@ -470,11 +470,11 @@ GST_START_TEST (test_single_layer_automatic_transition)
assert_equals_uint64 (_START (src1), 500); assert_equals_uint64 (_START (src1), 500);
assert_equals_uint64 (_DURATION (src1), 1250 - 500); assert_equals_uint64 (_DURATION (src1), 1250 - 500);
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 2); assert_equals_int (g_list_length (objects), 2);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 2); assert_equals_int (g_list_length (objects), 2);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
@ -496,7 +496,7 @@ GST_START_TEST (test_single_layer_automatic_transition)
assert_equals_uint64 (_START (src2), 1250); assert_equals_uint64 (_START (src2), 1250);
assert_equals_uint64 (_DURATION (src2), 1000); assert_equals_uint64 (_DURATION (src2), 1000);
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 3); assert_equals_int (g_list_length (objects), 3);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
@ -515,7 +515,7 @@ GST_START_TEST (test_single_layer_automatic_transition)
assert_equals_uint64 (_START (src1), 500); assert_equals_uint64 (_START (src1), 500);
assert_equals_uint64 (_DURATION (src1), 1250 - 500); assert_equals_uint64 (_DURATION (src1), 1250 - 500);
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 7); assert_equals_int (g_list_length (objects), 7);
assert_is_type (objects->data, GES_TYPE_TEST_CLIP); assert_is_type (objects->data, GES_TYPE_TEST_CLIP);
fail_unless (objects->data == src1); fail_unless (objects->data == src1);
@ -571,7 +571,7 @@ GST_START_TEST (test_single_layer_automatic_transition)
/* We check that the transition as actually been freed */ /* We check that the transition as actually been freed */
fail_if (GES_IS_TRANSITION_CLIP (transition)); fail_if (GES_IS_TRANSITION_CLIP (transition));
objects = ges_timeline_layer_get_objects (layer); objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 3); assert_equals_int (g_list_length (objects), 3);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
@ -590,7 +590,7 @@ GST_START_TEST (test_single_layer_automatic_transition)
assert_equals_uint64 (_START (src2), 1100); assert_equals_uint64 (_START (src2), 1100);
assert_equals_uint64 (_DURATION (src2), 1000); assert_equals_uint64 (_DURATION (src2), 1000);
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 5); assert_equals_int (g_list_length (objects), 5);
assert_is_type (objects->data, GES_TYPE_TEST_CLIP); assert_is_type (objects->data, GES_TYPE_TEST_CLIP);
fail_unless (current->data == src1); fail_unless (current->data == src1);
@ -630,7 +630,7 @@ GST_START_TEST (test_single_layer_automatic_transition)
assert_equals_uint64 (_START (src2), 1000); assert_equals_uint64 (_START (src2), 1000);
assert_equals_uint64 (_DURATION (src2), 1000); assert_equals_uint64 (_DURATION (src2), 1000);
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
current = objects; current = objects;
assert_equals_int (g_list_length (objects), 7); assert_equals_int (g_list_length (objects), 7);
assert_is_type (objects->data, GES_TYPE_TEST_CLIP); assert_is_type (objects->data, GES_TYPE_TEST_CLIP);
@ -731,7 +731,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
assert_equals_uint64 (_DURATION (src1), 1500 - 500); assert_equals_uint64 (_DURATION (src1), 1500 - 500);
GST_DEBUG ("Checking that a transition has been added"); GST_DEBUG ("Checking that a transition has been added");
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 4); assert_equals_int (g_list_length (objects), 4);
assert_is_type (current->data, GES_TYPE_TEST_CLIP); assert_is_type (current->data, GES_TYPE_TEST_CLIP);
@ -775,7 +775,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
assert_equals_uint64 (_DURATION (src3), 1500 - 500); assert_equals_uint64 (_DURATION (src3), 1500 - 500);
GST_DEBUG ("Checking transitions on first layer"); GST_DEBUG ("Checking transitions on first layer");
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 4); assert_equals_int (g_list_length (objects), 4);
assert_is_type (current->data, GES_TYPE_TEST_CLIP); assert_is_type (current->data, GES_TYPE_TEST_CLIP);
@ -794,7 +794,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1); ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1);
GST_DEBUG ("Checking transitions on second layer"); GST_DEBUG ("Checking transitions on second layer");
current = objects = ges_timeline_layer_get_objects (layer1); current = objects = ges_timeline_layer_get_clips (layer1);
assert_equals_int (g_list_length (objects), 2); assert_equals_int (g_list_length (objects), 2);
fail_unless (current->data == src2); fail_unless (current->data == src2);
fail_unless (current->next->data == src3); fail_unless (current->next->data == src3);
@ -823,7 +823,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
assert_equals_uint64 (_DURATION (src3), 1500 - 500); assert_equals_uint64 (_DURATION (src3), 1500 - 500);
GST_DEBUG ("Checking transitions on first layer"); GST_DEBUG ("Checking transitions on first layer");
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 4); assert_equals_int (g_list_length (objects), 4);
assert_is_type (current->data, GES_TYPE_TEST_CLIP); assert_is_type (current->data, GES_TYPE_TEST_CLIP);
@ -842,7 +842,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1); ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1);
GST_DEBUG ("Checking transitions has been added on second layer"); GST_DEBUG ("Checking transitions has been added on second layer");
current = objects = ges_timeline_layer_get_objects (layer1); current = objects = ges_timeline_layer_get_clips (layer1);
assert_equals_int (g_list_length (objects), 4); assert_equals_int (g_list_length (objects), 4);
assert_is_type (current->data, GES_TYPE_TEST_CLIP); assert_is_type (current->data, GES_TYPE_TEST_CLIP);
@ -881,7 +881,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
assert_equals_uint64 (_DURATION (src3), 2000 - 1000); assert_equals_uint64 (_DURATION (src3), 2000 - 1000);
GST_DEBUG ("Checking transitions on first layer"); GST_DEBUG ("Checking transitions on first layer");
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 4); assert_equals_int (g_list_length (objects), 4);
assert_is_type (current->data, GES_TYPE_TEST_CLIP); assert_is_type (current->data, GES_TYPE_TEST_CLIP);
@ -900,7 +900,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1); ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1);
GST_DEBUG ("Checking transitions has been removed on second layer"); GST_DEBUG ("Checking transitions has been removed on second layer");
current = objects = ges_timeline_layer_get_objects (layer1); current = objects = ges_timeline_layer_get_clips (layer1);
assert_equals_int (g_list_length (objects), 2); assert_equals_int (g_list_length (objects), 2);
fail_unless (current->data == src2); fail_unless (current->data == src2);
fail_unless (current->next->data == src3); fail_unless (current->next->data == src3);
@ -929,7 +929,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
assert_equals_uint64 (_DURATION (src3), 2000 - 1000); assert_equals_uint64 (_DURATION (src3), 2000 - 1000);
GST_DEBUG ("Checking transitions on first layer"); GST_DEBUG ("Checking transitions on first layer");
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 7); assert_equals_int (g_list_length (objects), 7);
fail_unless (current->data == src); fail_unless (current->data == src);
@ -967,7 +967,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1); ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1);
GST_DEBUG ("Checking second layer"); GST_DEBUG ("Checking second layer");
current = objects = ges_timeline_layer_get_objects (layer1); current = objects = ges_timeline_layer_get_clips (layer1);
assert_equals_int (g_list_length (objects), 1); assert_equals_int (g_list_length (objects), 1);
fail_unless (current->data == src2); fail_unless (current->data == src2);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
@ -995,7 +995,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
assert_equals_uint64 (_DURATION (src3), 2000 - 1000); assert_equals_uint64 (_DURATION (src3), 2000 - 1000);
GST_DEBUG ("Checking transitions on first layer"); GST_DEBUG ("Checking transitions on first layer");
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 4); assert_equals_int (g_list_length (objects), 4);
fail_unless (current->data == src1); fail_unless (current->data == src1);
@ -1017,7 +1017,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1); ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1);
GST_DEBUG ("Checking second layer"); GST_DEBUG ("Checking second layer");
current = objects = ges_timeline_layer_get_objects (layer1); current = objects = ges_timeline_layer_get_clips (layer1);
assert_equals_int (g_list_length (objects), 2); assert_equals_int (g_list_length (objects), 2);
assert_is_type (current->data, GES_TYPE_TEST_CLIP); assert_is_type (current->data, GES_TYPE_TEST_CLIP);
assert_is_type (current->next->data, GES_TYPE_TEST_CLIP); assert_is_type (current->next->data, GES_TYPE_TEST_CLIP);
@ -1046,7 +1046,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
assert_equals_uint64 (_DURATION (src3), 2000 - 1000); assert_equals_uint64 (_DURATION (src3), 2000 - 1000);
GST_DEBUG ("Checking transitions on first layer"); GST_DEBUG ("Checking transitions on first layer");
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 7); assert_equals_int (g_list_length (objects), 7);
fail_unless (current->data == src1); fail_unless (current->data == src1);
@ -1083,7 +1083,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1); ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1);
GST_DEBUG ("Checking second layer"); GST_DEBUG ("Checking second layer");
current = objects = ges_timeline_layer_get_objects (layer1); current = objects = ges_timeline_layer_get_clips (layer1);
assert_equals_int (g_list_length (objects), 1); assert_equals_int (g_list_length (objects), 1);
assert_is_type (current->data, GES_TYPE_TEST_CLIP); assert_is_type (current->data, GES_TYPE_TEST_CLIP);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
@ -1111,7 +1111,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
assert_equals_uint64 (_DURATION (src3), 2000 - 1000); assert_equals_uint64 (_DURATION (src3), 2000 - 1000);
GST_DEBUG ("Checking transitions on first layer"); GST_DEBUG ("Checking transitions on first layer");
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 7); assert_equals_int (g_list_length (objects), 7);
fail_unless (current->data == src1); fail_unless (current->data == src1);
@ -1148,7 +1148,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1); ASSERT_OBJECT_REFCOUNT (transition, "Only the layer owns a ref", 1);
GST_DEBUG ("Checking second layer"); GST_DEBUG ("Checking second layer");
current = objects = ges_timeline_layer_get_objects (layer1); current = objects = ges_timeline_layer_get_clips (layer1);
assert_equals_int (g_list_length (objects), 1); assert_equals_int (g_list_length (objects), 1);
assert_is_type (current->data, GES_TYPE_TEST_CLIP); assert_is_type (current->data, GES_TYPE_TEST_CLIP);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
@ -1220,7 +1220,7 @@ GST_START_TEST (test_layer_activate_automatic_transition)
assert_equals_uint64 (_DURATION (src3), 500); assert_equals_uint64 (_DURATION (src3), 500);
GST_DEBUG ("Checking that no transition has been added"); GST_DEBUG ("Checking that no transition has been added");
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 4); assert_equals_int (g_list_length (objects), 4);
assert_is_type (current->data, GES_TYPE_TEST_CLIP); assert_is_type (current->data, GES_TYPE_TEST_CLIP);
g_list_free_full (objects, gst_object_unref); g_list_free_full (objects, gst_object_unref);
@ -1242,7 +1242,7 @@ GST_START_TEST (test_layer_activate_automatic_transition)
* 1000____src2_______2000 * 1000____src2_______2000
* 2000_______src3_____2500 * 2000_______src3_____2500
*/ */
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 5); assert_equals_int (g_list_length (objects), 5);
current = current->next; current = current->next;
assert_is_type (current->data, GES_TYPE_TEST_CLIP); assert_is_type (current->data, GES_TYPE_TEST_CLIP);
@ -1263,7 +1263,7 @@ GST_START_TEST (test_layer_activate_automatic_transition)
* 1000____src2_______2000 * 1000____src2_______2000
* 2000_______src3_____2500 * 2000_______src3_____2500
*/ */
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 8); assert_equals_int (g_list_length (objects), 8);
assert_equals_uint64 (_START (src), 0); assert_equals_uint64 (_START (src), 0);
assert_equals_uint64 (_DURATION (src), 1000); assert_equals_uint64 (_DURATION (src), 1000);
@ -1323,7 +1323,7 @@ GST_START_TEST (test_layer_activate_automatic_transition)
* !__tr__^ * !__tr__^
* 2000_______src3_____2500 * 2000_______src3_____2500
*/ */
current = objects = ges_timeline_layer_get_objects (layer); current = objects = ges_timeline_layer_get_clips (layer);
assert_equals_int (g_list_length (objects), 10); assert_equals_int (g_list_length (objects), 10);
assert_equals_uint64 (_START (src), 0); assert_equals_uint64 (_START (src), 0);
assert_equals_uint64 (_DURATION (src), 1000); assert_equals_uint64 (_DURATION (src), 1000);

2
tests/check/ges/overlays.c
View file

@ -177,7 +177,7 @@ GST_START_TEST (test_overlay_in_layer)
GST_DEBUG ("removing the source"); GST_DEBUG ("removing the source");
ges_timeline_layer_remove_object (layer, (GESClip *) source); ges_timeline_layer_remove_clip (layer, (GESClip *) source);
GST_DEBUG ("removing the layer"); GST_DEBUG ("removing the layer");

2
tests/check/ges/project.c
View file

@ -205,7 +205,7 @@ _test_project (GESProject * project, GESTimeline * timeline)
assert_equals_string (ges_meta_container_get_string (GES_META_CONTAINER assert_equals_string (ges_meta_container_get_string (GES_META_CONTAINER
(project), "name"), "Example project"); (project), "name"), "Example project");
clips = clips =
ges_timeline_layer_get_objects (GES_TIMELINE_LAYER (timeline->layers-> ges_timeline_layer_get_clips (GES_TIMELINE_LAYER (timeline->layers->
data)); data));
fail_unless (ges_meta_container_get_uint (GES_META_CONTAINER (timeline-> fail_unless (ges_meta_container_get_uint (GES_META_CONTAINER (timeline->
layers->data), "a", &a_meta)); layers->data), "a", &a_meta));

28
tests/check/ges/simplelayer.c
View file

@ -110,7 +110,7 @@ GST_START_TEST (test_gsl_add)
(GESClip *) NULL); (GESClip *) NULL);
fail_unless_equals_int (result, -1); fail_unless_equals_int (result, -1);
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (source))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (source)));
fail_unless (ges_timeline_remove_track (timeline, track)); fail_unless (ges_timeline_remove_track (timeline, track));
fail_unless (ges_timeline_remove_layer (timeline, layer)); fail_unless (ges_timeline_remove_layer (timeline, layer));
g_object_unref (timeline); g_object_unref (timeline);
@ -201,21 +201,21 @@ GST_START_TEST (test_gsl_move_simple)
/* remove source1, source2 should be moved to the beginning */ /* remove source1, source2 should be moved to the beginning */
g_object_ref (source1); g_object_ref (source1);
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (source1))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (source1)));
fail_unless_equals_uint64 (_START (source2), 0); fail_unless_equals_uint64 (_START (source2), 0);
g_object_set (source1, "start", (guint64) 42, NULL); g_object_set (source1, "start", (guint64) 42, NULL);
/* re-add source1... using the normal API, it should be added to the end */ /* re-add source1... using the normal API, it should be added to the end */
fail_unless (ges_timeline_layer_add_object (layer, GES_CLIP (source1))); fail_unless (ges_timeline_layer_add_clip (layer, GES_CLIP (source1)));
fail_unless_equals_uint64 (_START (source2), 0); fail_unless_equals_uint64 (_START (source2), 0);
fail_unless_equals_uint64 (_START (source1), GST_SECOND); fail_unless_equals_uint64 (_START (source1), GST_SECOND);
/* remove source1 ... */ /* remove source1 ... */
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (source1))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (source1)));
fail_unless_equals_uint64 (_START (source2), 0); fail_unless_equals_uint64 (_START (source2), 0);
/* ... and source2 */ /* ... and source2 */
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (source2))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (source2)));
fail_unless (ges_timeline_remove_track (timeline, track)); fail_unless (ges_timeline_remove_track (timeline, track));
fail_unless (ges_timeline_remove_layer (timeline, layer)); fail_unless (ges_timeline_remove_layer (timeline, layer));
@ -463,7 +463,7 @@ GST_START_TEST (test_gsl_with_transitions)
GST_DEBUG ("Removing source1"); GST_DEBUG ("Removing source1");
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (source1))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (source1)));
/* layer should now be invalid */ /* layer should now be invalid */
@ -473,9 +473,9 @@ GST_START_TEST (test_gsl_with_transitions)
GST_DEBUG ("Removing source2/3/4"); GST_DEBUG ("Removing source2/3/4");
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (source2))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (source2)));
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (source3))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (source3)));
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (source4))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (source4)));
g_object_get (G_OBJECT (layer), "valid", &valid, NULL); g_object_get (G_OBJECT (layer), "valid", &valid, NULL);
fail_unless (!valid); fail_unless (!valid);
@ -483,11 +483,11 @@ GST_START_TEST (test_gsl_with_transitions)
GST_DEBUG ("Removing transitions"); GST_DEBUG ("Removing transitions");
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (tr1))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (tr1)));
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (tr2))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (tr2)));
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (tr3))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (tr3)));
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (tr4))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (tr4)));
fail_unless (ges_timeline_layer_remove_object (layer, GES_CLIP (tr5))); fail_unless (ges_timeline_layer_remove_clip (layer, GES_CLIP (tr5)));
GST_DEBUG ("done removing transition"); GST_DEBUG ("done removing transition");

2
tests/check/ges/text_properties.c
View file

@ -89,7 +89,7 @@ GST_START_TEST (test_text_properties_in_layer)
GST_DEBUG ("removing the source"); GST_DEBUG ("removing the source");
ges_timeline_layer_remove_object (layer, (GESClip *) source); ges_timeline_layer_remove_clip (layer, (GESClip *) source);
GST_DEBUG ("removing the layer"); GST_DEBUG ("removing the layer");

12
tests/check/ges/timelineedition.c
View file

@ -293,7 +293,7 @@ GST_START_TEST (test_snapping)
assert_equals_int (ges_timeline_layer_get_priority (layer), 0); assert_equals_int (ges_timeline_layer_get_priority (layer), 0);
fail_unless (ges_timeline_layer_add_object (layer, obj)); fail_unless (ges_timeline_layer_add_clip (layer, obj));
fail_unless ((trackelements = ges_clip_get_track_elements (obj)) != NULL); fail_unless ((trackelements = ges_clip_get_track_elements (obj)) != NULL);
fail_unless ((trackelement = fail_unless ((trackelement =
GES_TRACK_ELEMENT (trackelements->data)) != NULL); GES_TRACK_ELEMENT (trackelements->data)) != NULL);
@ -308,7 +308,7 @@ GST_START_TEST (test_snapping)
* + layer */ * + layer */
ASSERT_OBJECT_REFCOUNT (obj, "First clip", 1); ASSERT_OBJECT_REFCOUNT (obj, "First clip", 1);
fail_unless (ges_timeline_layer_add_object (layer, obj1)); fail_unless (ges_timeline_layer_add_clip (layer, obj1));
fail_unless ((trackelements = ges_clip_get_track_elements (obj1)) != NULL); fail_unless ((trackelements = ges_clip_get_track_elements (obj1)) != NULL);
fail_unless ((trackelement1 = fail_unless ((trackelement1 =
GES_TRACK_ELEMENT (trackelements->data)) != NULL); GES_TRACK_ELEMENT (trackelements->data)) != NULL);
@ -320,7 +320,7 @@ GST_START_TEST (test_snapping)
ASSERT_OBJECT_REFCOUNT (trackelement1, "First trackelement", 3); ASSERT_OBJECT_REFCOUNT (trackelement1, "First trackelement", 3);
ASSERT_OBJECT_REFCOUNT (obj1, "First clip", 1); ASSERT_OBJECT_REFCOUNT (obj1, "First clip", 1);
fail_unless (ges_timeline_layer_add_object (layer, obj2)); fail_unless (ges_timeline_layer_add_clip (layer, obj2));
fail_unless ((trackelements = ges_clip_get_track_elements (obj2)) != NULL); fail_unless ((trackelements = ges_clip_get_track_elements (obj2)) != NULL);
fail_unless ((trackelement2 = fail_unless ((trackelement2 =
GES_TRACK_ELEMENT (trackelements->data)) != NULL); GES_TRACK_ELEMENT (trackelements->data)) != NULL);
@ -542,7 +542,7 @@ GST_START_TEST (test_timeline_edition_mode)
assert_equals_int (ges_timeline_layer_get_priority (layer), 0); assert_equals_int (ges_timeline_layer_get_priority (layer), 0);
fail_unless (ges_timeline_layer_add_object (layer, obj)); fail_unless (ges_timeline_layer_add_clip (layer, obj));
fail_unless ((trackelements = ges_clip_get_track_elements (obj)) != NULL); fail_unless ((trackelements = ges_clip_get_track_elements (obj)) != NULL);
fail_unless ((trackelement = fail_unless ((trackelement =
GES_TRACK_ELEMENT (trackelements->data)) != NULL); GES_TRACK_ELEMENT (trackelements->data)) != NULL);
@ -555,7 +555,7 @@ GST_START_TEST (test_timeline_edition_mode)
fail_unless (layer != layer1); fail_unless (layer != layer1);
assert_equals_int (ges_timeline_layer_get_priority (layer1), 1); assert_equals_int (ges_timeline_layer_get_priority (layer1), 1);
fail_unless (ges_timeline_layer_add_object (layer1, obj1)); fail_unless (ges_timeline_layer_add_clip (layer1, obj1));
fail_unless ((trackelements = ges_clip_get_track_elements (obj1)) != NULL); fail_unless ((trackelements = ges_clip_get_track_elements (obj1)) != NULL);
fail_unless ((trackelement1 = fail_unless ((trackelement1 =
GES_TRACK_ELEMENT (trackelements->data)) != NULL); GES_TRACK_ELEMENT (trackelements->data)) != NULL);
@ -563,7 +563,7 @@ GST_START_TEST (test_timeline_edition_mode)
assert_equals_uint64 (_DURATION (trackelement1), 10); assert_equals_uint64 (_DURATION (trackelement1), 10);
g_list_free_full (trackelements, g_object_unref); g_list_free_full (trackelements, g_object_unref);
fail_unless (ges_timeline_layer_add_object (layer1, obj2)); fail_unless (ges_timeline_layer_add_clip (layer1, obj2));
fail_unless ((trackelements = ges_clip_get_track_elements (obj2)) != NULL); fail_unless ((trackelements = ges_clip_get_track_elements (obj2)) != NULL);
fail_unless ((trackelement2 = fail_unless ((trackelement2 =
GES_TRACK_ELEMENT (trackelements->data)) != NULL); GES_TRACK_ELEMENT (trackelements->data)) != NULL);

2
tests/check/ges/titles.c
View file

@ -182,7 +182,7 @@ GST_START_TEST (test_title_source_in_layer)
GST_DEBUG ("removing the source"); GST_DEBUG ("removing the source");
ges_timeline_layer_remove_object (layer, (GESClip *) source); ges_timeline_layer_remove_clip (layer, (GESClip *) source);
GST_DEBUG ("removing the layer"); GST_DEBUG ("removing the layer");

8
tests/examples/ges-ui.c
View file

@ -1039,7 +1039,7 @@ app_delete_objects (App * app, GList * objects)
GList *cur; GList *cur;
for (cur = objects; cur; cur = cur->next) { for (cur = objects; cur; cur = cur->next) {
ges_timeline_layer_remove_object (app->layer, GES_CLIP (cur->data)); ges_timeline_layer_remove_clip (app->layer, GES_CLIP (cur->data));
cur->data = NULL; cur->data = NULL;
} }
@ -1055,7 +1055,7 @@ app_move_selected_up (App * app)
GList *objects, *tmp; GList *objects, *tmp;
gint pos; gint pos;
objects = ges_timeline_layer_get_objects (app->layer); objects = ges_timeline_layer_get_clips (app->layer);
pos = g_list_index (objects, app->selected_objects->data); pos = g_list_index (objects, app->selected_objects->data);
ges_simple_timeline_layer_move_object (GES_SIMPLE_TIMELINE_LAYER (app->layer), ges_simple_timeline_layer_move_object (GES_SIMPLE_TIMELINE_LAYER (app->layer),
@ -1075,7 +1075,7 @@ app_add_effect_on_selected_clips (App * app, const gchar * bin_desc,
/* No crash if the video is playing */ /* No crash if the video is playing */
gst_element_set_state (GST_ELEMENT (app->pipeline), GST_STATE_PAUSED); gst_element_set_state (GST_ELEMENT (app->pipeline), GST_STATE_PAUSED);
objects = ges_timeline_layer_get_objects (app->layer); objects = ges_timeline_layer_get_clips (app->layer);
for (tmp = objects; tmp; tmp = tmp->next) { for (tmp = objects; tmp; tmp = tmp->next) {
effect = GES_TRACK_ELEMENT (ges_effect_new (bin_desc)); effect = GES_TRACK_ELEMENT (ges_effect_new (bin_desc));
@ -1130,7 +1130,7 @@ app_move_selected_down (App * app)
GList *objects, *tmp; GList *objects, *tmp;
gint pos; gint pos;
objects = ges_timeline_layer_get_objects (app->layer); objects = ges_timeline_layer_get_clips (app->layer);
pos = g_list_index (objects, app->selected_objects->data); pos = g_list_index (objects, app->selected_objects->data);
ges_simple_timeline_layer_move_object (GES_SIMPLE_TIMELINE_LAYER (app->layer), ges_simple_timeline_layer_move_object (GES_SIMPLE_TIMELINE_LAYER (app->layer),

4
tests/examples/overlays.c
View file

@ -109,8 +109,8 @@ make_timeline (char *path, float duration, char *text, guint32 color,
aduration = (guint64) (duration * GST_SECOND); aduration = (guint64) (duration * GST_SECOND);
srca = make_source (path, 0, aduration, 1); srca = make_source (path, 0, aduration, 1);
overlay = make_overlay (text, 0, aduration, 0, color, xpos, ypos); overlay = make_overlay (text, 0, aduration, 0, color, xpos, ypos);
ges_timeline_layer_add_object (layer1, srca); ges_timeline_layer_add_clip (layer1, srca);
ges_timeline_layer_add_object (layer1, overlay); ges_timeline_layer_add_clip (layer1, overlay);
return pipeline; return pipeline;
} }

2
tests/examples/simple1.c
View file

@ -94,7 +94,7 @@ main (int argc, gchar ** argv)
g_free (uri); g_free (uri);
g_object_set (src, "in-point", inpoint * GST_SECOND, g_object_set (src, "in-point", inpoint * GST_SECOND,
"duration", duration * GST_SECOND, "mute", mute, NULL); "duration", duration * GST_SECOND, "mute", mute, NULL);
ges_timeline_layer_add_object (layer1, GES_CLIP (src)); ges_timeline_layer_add_clip (layer1, GES_CLIP (src));
} }
/* Play the pipeline */ /* Play the pipeline */

2
tests/examples/test2.c
View file

@ -70,7 +70,7 @@ main (int argc, gchar ** argv)
g_object_set (src, "start", offset, "duration", GST_SECOND, NULL); g_object_set (src, "start", offset, "duration", GST_SECOND, NULL);
ges_timeline_layer_add_object (layer, (GESClip *) src); ges_timeline_layer_add_clip (layer, (GESClip *) src);
} }
/* In order to listen our timeline, let's grab a convenience pipeline to put /* In order to listen our timeline, let's grab a convenience pipeline to put

2
tests/examples/test3.c
View file

@ -70,7 +70,7 @@ main (int argc, gchar ** argv)
g_object_set (src, "duration", GST_SECOND, NULL); g_object_set (src, "duration", GST_SECOND, NULL);
/* Since we're using a GESSimpleTimelineLayer, objects will be automatically /* Since we're using a GESSimpleTimelineLayer, objects will be automatically
* appended to the end of the layer */ * appended to the end of the layer */
ges_timeline_layer_add_object (layer, (GESClip *) src); ges_timeline_layer_add_clip (layer, (GESClip *) src);
} }
/* In order to view our timeline, let's grab a convenience pipeline to put /* In order to view our timeline, let's grab a convenience pipeline to put

2
tests/examples/test4.c
View file

@ -125,7 +125,7 @@ main (int argc, gchar ** argv)
g_object_set (src, "duration", GST_SECOND, NULL); g_object_set (src, "duration", GST_SECOND, NULL);
/* Since we're using a GESSimpleTimelineLayer, objects will be automatically /* Since we're using a GESSimpleTimelineLayer, objects will be automatically
* appended to the end of the layer */ * appended to the end of the layer */
ges_timeline_layer_add_object (layer, (GESClip *) src); ges_timeline_layer_add_clip (layer, (GESClip *) src);
} }
/* In order to view our timeline, let's grab a convenience pipeline to put /* In order to view our timeline, let's grab a convenience pipeline to put

2
tests/examples/text_properties.c
View file

@ -81,7 +81,7 @@ make_timeline (char *path, float duration, char *text)
aduration = (guint64) (duration * GST_SECOND); aduration = (guint64) (duration * GST_SECOND);
srca = make_source (path, 0, aduration, 1, text); srca = make_source (path, 0, aduration, 1, text);
ges_timeline_layer_add_object (layer1, srca); ges_timeline_layer_add_clip (layer1, srca);
return pipeline; return pipeline;
} }

6
tests/examples/transition.c
View file

@ -128,8 +128,8 @@ make_timeline (gchar * nick, gdouble tdur, gchar * patha, gfloat adur,
tstart = aduration - tduration; tstart = aduration - tduration;
srca = make_source (patha, 0, aduration, ainpoint, 1); srca = make_source (patha, 0, aduration, ainpoint, 1);
srcb = make_source (pathb, tstart, bduration, binpoint, 2); srcb = make_source (pathb, tstart, bduration, binpoint, 2);
ges_timeline_layer_add_object (layer1, srca); ges_timeline_layer_add_clip (layer1, srca);
ges_timeline_layer_add_object (layer1, srcb); ges_timeline_layer_add_clip (layer1, srcb);
g_timeout_add_seconds (1, (GSourceFunc) print_transition_data, srca); g_timeout_add_seconds (1, (GSourceFunc) print_transition_data, srca);
g_timeout_add_seconds (1, (GSourceFunc) print_transition_data, srcb); g_timeout_add_seconds (1, (GSourceFunc) print_transition_data, srcb);
@ -143,7 +143,7 @@ make_timeline (gchar * nick, gdouble tdur, gchar * patha, gfloat adur,
g_object_set (tr, g_object_set (tr,
"start", (guint64) tstart, "start", (guint64) tstart,
"duration", (guint64) tduration, "in-point", (guint64) 0, NULL); "duration", (guint64) tduration, "in-point", (guint64) 0, NULL);
ges_timeline_layer_add_object (layer1, GES_CLIP (tr)); ges_timeline_layer_add_clip (layer1, GES_CLIP (tr));
g_timeout_add_seconds (1, (GSourceFunc) print_transition_data, tr); g_timeout_add_seconds (1, (GSourceFunc) print_transition_data, tr);
} }

2
tools/ges-launch.c
View file

@ -224,7 +224,7 @@ create_timeline (int nbargs, gchar ** argv, gchar * audio, gchar * video)
/* Since we're using a GESSimpleTimelineLayer, objects will be automatically /* Since we're using a GESSimpleTimelineLayer, objects will be automatically
* appended to the end of the layer */ * appended to the end of the layer */
ges_timeline_layer_add_object (layer, obj); ges_timeline_layer_add_clip (layer, obj);
} }
return timeline; return timeline;