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

Finish renaming timeline object to clip

Browse source
This commit is contained in:
Thibault Saunier 2013-02-08 17:11:22 -03:00
parent b4e1131b70
commit 4ddcfb642d
18 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ges/ges-clip.c
View file

@ -329,7 +329,7 @@ ges_clip_init (GESClip * self)
* @object: The origin #GESClip
* @type: The #GESTrackType to create a #GESTrackElement for.
*
* Creates a #GESTrackElement for the provided @type. The timeline object
* Creates a #GESTrackElement for the provided @type. The clip
* keep a reference to the newly created trackelement, you therefore need to
* call @ges_clip_release_track_element when you are done with it.
*
@ -430,7 +430,7 @@ ges_clip_create_track_elements_func (GESClip * object, GESTrackType type)
* @object: a #GESClip
* @trobj: the GESTrackElement
*
* Add a track element to the timeline object. Should only be called by
* Add a track element to the clip. Should only be called by
* subclasses implementing the create_track_elements (plural) vmethod.
*
* Takes a reference on @trobj.
@ -454,7 +454,7 @@ ges_clip_add_track_element (GESClip * object, GESTrackElement * trobj)
priv = object->priv;
is_effect = GES_IS_BASE_EFFECT (trobj);
GST_LOG ("Got a TrackElement : %p , setting the timeline object as its"
GST_LOG ("Got a TrackElement : %p , setting the clip as its"
"creator. Is a BaseEffect %i", trobj, is_effect);
if (!trobj)

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

@ -409,7 +409,7 @@ save_clips (xmlTextWriterPtr writer, GList * list)
xmlTextWriterStartElement (writer, BAD_CAST "timeline-objects");
GST_DEBUG ("Saving timeline objects");
GST_DEBUG ("Saving clips");
for (tmp = list; tmp; tmp = tmp->next) {
@ -1057,7 +1057,7 @@ load_pitivi_file_from_uri (GESFormatter * self,
list_sources (self);
if (!parse_clips (self)) {
GST_ERROR ("Couldn't find timeline objects markup in the xptv file");
GST_ERROR ("Couldn't find clips markup in the xptv file");
return FALSE;
}
@ -1068,7 +1068,7 @@ load_pitivi_file_from_uri (GESFormatter * self,
/* If there are no timeline objects to load we should emit
/* If there are no clips to load we should emit
* 'project-loaded' signal.
*/
if (!g_hash_table_size (priv->clips_table) && GES_FORMATTER (self)->project) {

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

@ -356,7 +356,7 @@ ges_simple_timeline_layer_add_object (GESSimpleTimelineLayer * layer,
* @layer: a #GESSimpleTimelineLayer
* @position: The position in position to get, starting from 0.
*
* Gets the timeline object at the given position.
* Gets the clip at the given position.
*
* Returns: (transfer none): The #GESClip at the given position or NULL if
* the position is off the end of the layer.

2
ges/ges-test-clip.c
View file

@ -179,7 +179,7 @@ ges_test_clip_init (GESTestClip * self)
* @self: the #GESTestClip on which to mute or unmute the audio track
* @mute: %TRUE to mute the audio track, %FALSE to unmute it
*
* Sets whether the audio track of this timeline object is muted or not.
* Sets whether the audio track of this clip is muted or not.
*
*/
void

2
ges/ges-text-overlay-clip.c
View file

@ -260,7 +260,7 @@ ges_text_overlay_clip_init (GESTextOverlayClip * self)
* @text: the text to render. an internal copy of this text will be
* made.
*
* Sets the text this timeline object will render.
* Sets the text this clip will render.
*
*/
void

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

@ -162,7 +162,7 @@ ges_timeline_layer_class_init (GESTimelineLayerClass * klass)
/**
* GESTimelineLayer:auto-transition:
*
* Sets whether transitions are added automagically when timeline objects overlap.
* Sets whether transitions are added automagically when clips overlap.
*/
g_object_class_install_property (object_class, PROP_AUTO_TRANSITION,
g_param_spec_boolean ("auto-transition", "Auto-Transition",
@ -407,10 +407,10 @@ ges_timeline_layer_get_priority (GESTimelineLayer * layer)
* ges_timeline_layer_get_objects:
* @layer: a #GESTimelineLayer
*
* Get the timeline objects this layer contains.
* Get the clips this layer contains.
*
* Returns: (transfer full) (element-type GESClip): a #GList of
* timeline objects. The user is responsible for
* clips. The user is responsible for
* unreffing the contained objects and freeing the list.
*/

11
ges/ges-timeline.c
View file

@ -28,7 +28,7 @@
* #GESTimeline is the central object for any multimedia timeline.
*
* Contains a list of #GESTimelineLayer which users should use to arrange the
* various timeline objects through time.
* various clips through time.
*
* The output type is determined by the #GESTrack that are set on
* the #GESTimeline.
@ -1733,8 +1733,7 @@ add_object_to_track (GESClip * object, GESTrackElement * track_element,
GESTrack * track)
{
if (!ges_clip_add_track_element (object, track_element)) {
GST_WARNING_OBJECT (object,
"Failed to add track element to timeline object");
GST_WARNING_OBJECT (object, "Failed to add track element to clip");
gst_object_unref (track_element);
return;
}
@ -2295,7 +2294,7 @@ ges_timeline_add_layer (GESTimeline * timeline, GESTimelineLayer * layer)
GST_DEBUG ("Done adding layer, emitting 'layer-added' signal");
g_signal_emit (timeline, ges_timeline_signals[LAYER_ADDED], 0, layer);
/* add any existing timeline objects to the timeline */
/* add any existing clips to the timeline */
objects = ges_timeline_layer_get_objects (layer);
for (tmp = objects; tmp; tmp = tmp->next) {
layer_object_added_cb (layer, tmp->data, timeline);
@ -2373,7 +2372,7 @@ ges_timeline_remove_layer (GESTimeline * timeline, GESTimelineLayer * layer)
* Returns: TRUE if the track was properly added, else FALSE.
*/
/* FIXME: create track elements for timeline objects which have already been
/* FIXME: create track elements for clips which have already been
* added to existing layers.
*/
@ -2419,7 +2418,7 @@ ges_timeline_add_track (GESTimeline * timeline, GESTrack * track)
/* emit 'track-added' */
g_signal_emit (timeline, ges_timeline_signals[TRACK_ADDED], 0, track);
/* ensure that each existing timeline object has the opportunity to create a
/* ensure that each existing clip has the opportunity to create a
* track element for this track*/
/* We connect to the object for the timeline editing mode management */

2
ges/ges-title-clip.c
View file

@ -285,7 +285,7 @@ ges_title_clip_init (GESTitleClip * self)
* @text: the text to render. an internal copy of this text will be
* made.
*
* Sets the text this timeline object will render.
* Sets the text this clip will render.
*
*/
void

6
ges/ges-uri-clip.c
View file

@ -175,7 +175,7 @@ ges_uri_clip_class_init (GESUriClipClass * klass)
*/
g_object_class_install_property (object_class, PROP_IS_IMAGE,
g_param_spec_boolean ("is-image", "Is still image",
"Whether the timeline object represents a still image or not",
"Whether the clip represents a still image or not",
FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
/* Redefine the supported formats property so the default value is UNKNOWN
@ -274,7 +274,7 @@ ges_uri_clip_init (GESUriClip * self)
* @self: the #GESUriClip on which to mute or unmute the audio track
* @mute: %TRUE to mute @self audio track, %FALSE to unmute it
*
* Sets whether the audio track of this timeline object is muted or not.
* Sets whether the audio track of this clip is muted or not.
*
*/
void
@ -319,7 +319,7 @@ filesource_set_max_duration (GESTimelineElement * element,
* @self: the #GESUriClip
* @is_image: %TRUE if @self is a still image, %FALSE otherwise
*
* Sets whether the timeline object is a still image or not.
* Sets whether the clip is a still image or not.
*/
void
ges_uri_clip_set_is_image (GESUriClip * self, gboolean is_image)

2
ges/ges.c
View file

@ -69,7 +69,7 @@ ges_init (void)
return TRUE;
}
/* register timeline object classes with the system */
/* register clip classes with the system */
GES_TYPE_TEST_CLIP;
GES_TYPE_URI_CLIP;

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

@ -174,7 +174,7 @@ GST_START_TEST (test_ges_scenario)
GST_END_TEST;
/* very similar to the above, except we add the timeline object to the layer
/* very similar to the above, except we add the clip to the layer
* and then add it to the timeline.
*/

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

@ -210,7 +210,7 @@ GST_START_TEST (test_filesource_images)
ges_track_remove_object (v, trobj);
ges_clip_release_track_element (clip, trobj);
/* the timeline object should not create any TrackElement in the audio track */
/* the clip should not create any TrackElement in the audio track */
trobj = ges_clip_create_track_element (clip, a->type);
fail_unless (trobj == NULL);

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

@ -248,7 +248,7 @@ find_row_for_object (GtkListStore * model, GtkTreeIter * ret, GESClip * object)
return FALSE;
}
/* this callback is registered for every timeline object, and updates the
/* this callback is registered for every clip, and updates the
* corresponding duration cell in the model */
static void
clip_notify_duration_cb (GESClip * object,

2
tests/examples/test1.c
View file

@ -42,7 +42,7 @@ main (int argc, gchar ** argv)
/* This is our main GESTimeline */
timeline = ges_timeline_new_audio_video ();
/* We are only going to be doing one layer of timeline objects */
/* We are only going to be doing one layer of clips */
layer = ges_timeline_layer_new ();
/* Add the tracks and the layer to the timeline */

2
tests/examples/test2.c
View file

@ -49,7 +49,7 @@ main (int argc, gchar ** argv)
tracka = ges_track_audio_raw_new ();
/* We are only going to be doing one layer of timeline objects */
/* We are only going to be doing one layer of clips */
layer = ges_timeline_layer_new ();
/* Add the tracks and the layer to the timeline */

2
tests/examples/test3.c
View file

@ -48,7 +48,7 @@ main (int argc, gchar ** argv)
tracka = ges_track_audio_raw_new ();
/* We are only going to be doing one layer of timeline objects */
/* We are only going to be doing one layer of clips */
layer = (GESTimelineLayer *) ges_simple_timeline_layer_new ();
/* Add the tracks and the layer to the timeline */

2
tests/examples/test4.c
View file

@ -103,7 +103,7 @@ main (int argc, gchar ** argv)
tracka = ges_track_audio_raw_new ();
/* We are only going to be doing one layer of timeline objects */
/* We are only going to be doing one layer of clips */
layer = (GESTimelineLayer *) ges_simple_timeline_layer_new ();
/* Add the tracks and the layer to the timeline */

2
tools/ges-launch.c
View file

@ -140,7 +140,7 @@ create_timeline (int nbargs, gchar ** argv, gchar * audio, gchar * video)
if (video)
trackv = ges_track_video_raw_new ();
/* We are only going to be doing one layer of timeline objects */
/* We are only going to be doing one layer of clips */
layer = (GESTimelineLayer *) ges_simple_timeline_layer_new ();
/* Add the tracks and the layer to the timeline */