mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 17:35:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

track: Rename all GESTrack.xxx_object to GESTrack.xxx_element

Browse source
This commit is contained in:
Thibault Saunier 2013-02-08 17:23:18 -03:00
parent fc8f06eedb
commit ec1db99266
13 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,12 +66,12 @@ GESCreateElementForGapFunc
ges_track_audio_raw_new
ges_track_video_raw_new
ges_track_new
ges_track_add_object
ges_track_remove_object
ges_track_add_element
ges_track_remove_element
ges_track_set_caps
ges_track_get_caps
ges_track_enable_update
ges_track_get_objects
ges_track_get_elements
ges_track_is_updating
ges_track_set_create_element_for_gap_func
<SUBSECTION Standard>

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

@ -453,7 +453,7 @@ _add_track_element (GESFormatter * self, GESClip * clip,
" To : %" GST_PTR_FORMAT, trackelement, clip);
ges_clip_add_track_element (clip, trackelement);
ges_track_add_object (track, trackelement);
ges_track_add_element (track, trackelement);
gst_structure_foreach (children_properties,
(GstStructureForeachFunc) _set_child_property, trackelement);
}

2
ges/ges-clip.c
View file

@ -1313,7 +1313,7 @@ ges_clip_split (GESClip * object, guint64 position)
GST_DEBUG_OBJECT (trackelement, "Was not in a track, not adding %p to"
"any track", new_trackelement);
else
ges_track_add_object (track, new_trackelement);
ges_track_add_element (track, new_trackelement);
/* Unlock TrackElement-s as we do not want the container to move
* syncronously */

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

@ -945,9 +945,9 @@ make_source (GESFormatter * self, GList * reflist, GHashTable * source_table)
ges_track_element_set_active (GES_TRACK_ELEMENT (effect), FALSE);
if (video)
ges_track_add_object (priv->trackv, GES_TRACK_ELEMENT (effect));
ges_track_add_element (priv->trackv, GES_TRACK_ELEMENT (effect));
else
ges_track_add_object (priv->tracka, GES_TRACK_ELEMENT (effect));
ges_track_add_element (priv->tracka, GES_TRACK_ELEMENT (effect));
/* Set effect properties */
keys = g_hash_table_get_keys (effect_table);

4
ges/ges-timeline.c
View file

@ -1738,7 +1738,7 @@ add_object_to_track (GESClip * object, GESTrackElement * track_element,
return;
}
if (!ges_track_add_object (track, track_element)) {
if (!ges_track_add_element (track, track_element)) {
GST_WARNING_OBJECT (object, "Failed to add track element to track");
ges_clip_release_track_element (object, track_element);
gst_object_unref (track_element);
@ -1907,7 +1907,7 @@ layer_object_removed_cb (GESTimelineLayer * layer, GESClip * object,
(GCompareFunc) custom_find_track))) {
GST_DEBUG ("Belongs to one of the tracks we control");
ges_track_remove_object (ges_track_element_get_track (trobj), trobj);
ges_track_remove_element (ges_track_element_get_track (trobj), trobj);
ges_clip_release_track_element (object, trobj);
}
/* removing the reference added by _get_track_elements() */

12
ges/ges-track.c
View file

@ -707,7 +707,7 @@ ges_track_set_caps (GESTrack * track, const GstCaps * caps)
}
/**
* ges_track_add_object:
* ges_track_add_element:
* @track: a #GESTrack
* @object: (transfer full): the #GESTrackElement to add
*
@ -720,7 +720,7 @@ ges_track_set_caps (GESTrack * track, const GstCaps * caps)
* want to accept the object.
*/
gboolean
ges_track_add_object (GESTrack * track, GESTrackElement * object)
ges_track_add_element (GESTrack * track, GESTrackElement * object)
{
g_return_val_if_fail (GES_IS_TRACK (track), FALSE);
g_return_val_if_fail (GES_IS_TRACK_ELEMENT (object), FALSE);
@ -770,7 +770,7 @@ ges_track_add_object (GESTrack * track, GESTrackElement * object)
}
/**
* ges_track_get_objects:
* ges_track_get_elements:
* @track: a #GESTrack
*
* Gets the #GESTrackElement contained in @track
@ -779,7 +779,7 @@ ges_track_add_object (GESTrack * track, GESTrackElement * object)
* #GESTrackElement present in the Track sorted by priority and start.
*/
GList *
ges_track_get_objects (GESTrack * track)
ges_track_get_elements (GESTrack * track)
{
GList *ret = NULL;
@ -793,7 +793,7 @@ ges_track_get_objects (GESTrack * track)
}
/**
* ges_track_remove_object:
* ges_track_remove_element:
* @track: a #GESTrack
* @object: the #GESTrackElement to remove
*
@ -806,7 +806,7 @@ ges_track_get_objects (GESTrack * track)
* could not remove the object (like if it didn't belong to the track).
*/
gboolean
ges_track_remove_object (GESTrack * track, GESTrackElement * object)
ges_track_remove_element (GESTrack * track, GESTrackElement * object)
{
GSequenceIter *it;
GESTrackPrivate *priv;

6
ges/ges-track.h
View file

@ -105,10 +105,10 @@ const GstCaps * ges_track_get_caps (GESTrack *track);
const GESTimeline *ges_track_get_timeline (GESTrack *track);
gboolean ges_track_add_object (GESTrack * track,
gboolean ges_track_add_element (GESTrack * track,
GESTrackElement * object);
gboolean ges_track_remove_object (GESTrack * track,
gboolean ges_track_remove_element (GESTrack * track,
GESTrackElement * object);
GESTrack *ges_track_video_raw_new (void);
@ -117,7 +117,7 @@ GESTrack *ges_track_audio_raw_new (void);
gboolean ges_track_enable_update (GESTrack * track, gboolean enabled);
gboolean ges_track_is_updating (GESTrack * track);
GList* ges_track_get_objects (GESTrack *track);
GList* ges_track_get_elements (GESTrack *track);
void
ges_track_set_create_element_for_gap_func (GESTrack *track,

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

@ -254,7 +254,7 @@ GST_START_TEST (test_gap_filling_basic)
trackelement = ges_clip_create_track_element (object, track->type);
ges_clip_add_track_element (object, trackelement);
fail_unless (ges_track_add_object (track, trackelement));
fail_unless (ges_track_add_element (track, trackelement));
fail_unless (trackelement != NULL);
gnlsrc = ges_track_element_get_gnlobject (trackelement);
fail_unless (gnlsrc != NULL);
@ -275,7 +275,7 @@ GST_START_TEST (test_gap_filling_basic)
trackelement1 = ges_clip_create_track_element (object1, track->type);
ges_clip_add_track_element (object1, trackelement1);
fail_unless (ges_track_add_object (track, trackelement1));
fail_unless (ges_track_add_element (track, trackelement1));
fail_unless (trackelement1 != NULL);
gnlsrc1 = ges_track_element_get_gnlobject (trackelement1);
fail_unless (gnlsrc1 != NULL);
@ -302,7 +302,7 @@ GST_START_TEST (test_gap_filling_basic)
g_object_set (object2, "start", (guint64) 35, "duration", (guint64) 5, NULL);
trackelement2 = ges_clip_create_track_element (object2, track->type);
ges_clip_add_track_element (object2, trackelement2);
fail_unless (ges_track_add_object (track, trackelement2));
fail_unless (ges_track_add_element (track, trackelement2));
fail_unless (trackelement2 != NULL);
assert_equals_uint64 (_START (trackelement2), 35);
assert_equals_uint64 (_DURATION (trackelement2), 5);

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

@ -74,7 +74,7 @@ GST_START_TEST (test_add_effect_to_clip)
fail_unless (ges_clip_add_track_element (GES_CLIP
(source), GES_TRACK_ELEMENT (base_effect)));
fail_unless (ges_track_add_object (track_video,
fail_unless (ges_track_add_element (track_video,
GES_TRACK_ELEMENT (base_effect)));
assert_equals_int (GES_TRACK_ELEMENT (base_effect)->active, TRUE);
@ -125,17 +125,17 @@ GST_START_TEST (test_get_effects_from_tl)
fail_unless (ges_clip_add_track_element (GES_CLIP
(source), GES_TRACK_ELEMENT (base_effect)));
fail_unless (ges_track_add_object (track_video,
fail_unless (ges_track_add_element (track_video,
GES_TRACK_ELEMENT (base_effect)));
fail_unless (ges_clip_add_track_element (GES_CLIP
(source), GES_TRACK_ELEMENT (base_effect1)));
fail_unless (ges_track_add_object (track_video,
fail_unless (ges_track_add_element (track_video,
GES_TRACK_ELEMENT (base_effect1)));
fail_unless (ges_clip_add_track_element (GES_CLIP
(source), GES_TRACK_ELEMENT (base_effect2)));
fail_unless (ges_track_add_object (track_video,
fail_unless (ges_track_add_element (track_video,
GES_TRACK_ELEMENT (base_effect2)));
g_object_get (G_OBJECT (source), "height", &clip_height, NULL);
@ -199,7 +199,7 @@ GST_START_TEST (test_effect_clip)
tck_effect = ges_effect_new ("identity");
fail_unless (ges_clip_add_track_element (GES_CLIP
(effect_clip), GES_TRACK_ELEMENT (tck_effect)));
fail_unless (ges_track_add_object (track_video,
fail_unless (ges_track_add_element (track_video,
GES_TRACK_ELEMENT (tck_effect)));
g_object_get (effect_clip, "height", &clip_height, NULL);
@ -208,7 +208,7 @@ GST_START_TEST (test_effect_clip)
tck_effect1 = ges_effect_new ("identity");
fail_unless (ges_clip_add_track_element (GES_CLIP
(effect_clip), GES_TRACK_ELEMENT (tck_effect1)));
fail_unless (ges_track_add_object (track_audio,
fail_unless (ges_track_add_element (track_audio,
GES_TRACK_ELEMENT (tck_effect1)));
g_object_get (effect_clip, "height", &clip_height, NULL);
@ -268,7 +268,7 @@ GST_START_TEST (test_priorities_clip)
tck_effect = ges_effect_new ("identity");
fail_unless (ges_clip_add_track_element (GES_CLIP
(effect_clip), GES_TRACK_ELEMENT (tck_effect)));
fail_unless (ges_track_add_object (track_video,
fail_unless (ges_track_add_element (track_video,
GES_TRACK_ELEMENT (tck_effect)));
g_object_get (effect_clip, "height", &clip_height, NULL);
@ -277,7 +277,7 @@ GST_START_TEST (test_priorities_clip)
tck_effect1 = ges_effect_new ("identity");
fail_unless (ges_clip_add_track_element (GES_CLIP
(effect_clip), GES_TRACK_ELEMENT (tck_effect1)));
fail_unless (ges_track_add_object (track_audio,
fail_unless (ges_track_add_element (track_audio,
GES_TRACK_ELEMENT (tck_effect1)));
fail_unless (ges_clip_set_top_effect_priority (GES_CLIP
@ -343,7 +343,7 @@ GST_START_TEST (test_base_effect_set_properties)
tck_effect = GES_TRACK_ELEMENT (ges_effect_new ("agingtv"));
fail_unless (ges_clip_add_track_element (GES_CLIP (effect_clip), tck_effect));
fail_unless (ges_track_add_object (track_video, tck_effect));
fail_unless (ges_track_add_element (track_video, tck_effect));
ges_track_element_set_child_properties (tck_effect,
"GstAgingTV::scratch-lines", 17, "color-aging", FALSE, NULL);
@ -430,7 +430,7 @@ GST_START_TEST (test_clip_signals)
tck_effect = ges_effect_new ("agingtv");
fail_unless (ges_clip_add_track_element (GES_CLIP
(effect_clip), GES_TRACK_ELEMENT (tck_effect)));
fail_unless (ges_track_add_object (track_video,
fail_unless (ges_track_add_element (track_video,
GES_TRACK_ELEMENT (tck_effect)));
g_signal_connect (tck_effect, "deep-notify", (GCallback) deep_prop_changed_cb,
tck_effect);

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

@ -224,7 +224,7 @@ _test_project (GESProject * project, GESTimeline * timeline)
GList *trackelements;
track = GES_TRACK (tmp->data);
trackelements = ges_track_get_objects (track);
trackelements = ges_track_get_elements (track);
GST_DEBUG_OBJECT (track, "Testing track");
switch (track->type) {
case GES_TRACK_TYPE_VIDEO:

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

@ -93,19 +93,19 @@ GST_START_TEST (test_basic_timeline_edition)
trackelement = ges_clip_create_track_element (obj, track->type);
fail_unless (trackelement != NULL);
fail_unless (ges_clip_add_track_element (obj, trackelement));
fail_unless (ges_track_add_object (track, trackelement));
fail_unless (ges_track_add_element (track, trackelement));
assert_equals_uint64 (_DURATION (trackelement), 10);
trackelement1 = ges_clip_create_track_element (obj1, track->type);
fail_unless (trackelement1 != NULL);
fail_unless (ges_clip_add_track_element (obj1, trackelement1));
fail_unless (ges_track_add_object (track, trackelement1));
fail_unless (ges_track_add_element (track, trackelement1));
assert_equals_uint64 (_DURATION (trackelement1), 10);
trackelement2 = ges_clip_create_track_element (obj2, track->type);
fail_unless (ges_clip_add_track_element (obj2, trackelement2));
fail_unless (trackelement2 != NULL);
fail_unless (ges_track_add_object (track, trackelement2));
fail_unless (ges_track_add_element (track, trackelement2));
assert_equals_uint64 (_DURATION (trackelement2), 60);
/**

4
tests/check/ges/uriclip.c
View file

@ -57,7 +57,7 @@ asset_created_cb (GObject * source, GAsyncResult * res, gpointer udata)
tracks = ges_timeline_get_tracks (ges_timeline_layer_get_timeline (layer));
for (tmp = tracks; tmp; tmp = tmp->next) {
GList *trackelements = ges_track_get_objects (GES_TRACK (tmp->data));
GList *trackelements = ges_track_get_elements (GES_TRACK (tmp->data));
assert_equals_int (g_list_length (trackelements), 1);
fail_unless (GES_IS_TRACK_FILESOURCE (trackelements->data));
@ -207,7 +207,7 @@ GST_START_TEST (test_filesource_images)
* and the timelinobject holds a reference to the object */
ASSERT_OBJECT_REFCOUNT (trobj, "Video Track Element", 2);
ges_track_remove_object (v, trobj);
ges_track_remove_element (v, trobj);
ges_clip_release_track_element (clip, trobj);
/* the clip should not create any TrackElement in the audio track */

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

@ -1082,9 +1082,9 @@ app_add_effect_on_selected_clips (App * app, const gchar * bin_desc,
ges_clip_add_track_element (GES_CLIP (tmp->data), effect);
if (type == GES_TRACK_TYPE_VIDEO)
ges_track_add_object (app->video_track, effect);
ges_track_add_element (app->video_track, effect);
else if (type == GES_TRACK_TYPE_AUDIO)
ges_track_add_object (app->audio_track, effect);
ges_track_add_element (app->audio_track, effect);
g_object_unref (tmp->data);
}