From 4ddcfb642d57f3027d503443e1c8aefa6fb17c3a Mon Sep 17 00:00:00 2001
From: Thibault Saunier <thibault.saunier@collabora.com>
Date: Fri, 8 Feb 2013 17:11:22 -0300
Subject: [PATCH] Finish renaming timeline object to clip

---
 ges/ges-clip.c                  |  6 +++---
 ges/ges-pitivi-formatter.c      |  6 +++---
 ges/ges-simple-timeline-layer.c |  2 +-
 ges/ges-test-clip.c             |  2 +-
 ges/ges-text-overlay-clip.c     |  2 +-
 ges/ges-timeline-layer.c        |  6 +++---
 ges/ges-timeline.c              | 11 +++++------
 ges/ges-title-clip.c            |  2 +-
 ges/ges-uri-clip.c              |  6 +++---
 ges/ges.c                       |  2 +-
 tests/check/ges/basic.c         |  2 +-
 tests/check/ges/uriclip.c       |  2 +-
 tests/examples/ges-ui.c         |  2 +-
 tests/examples/test1.c          |  2 +-
 tests/examples/test2.c          |  2 +-
 tests/examples/test3.c          |  2 +-
 tests/examples/test4.c          |  2 +-
 tools/ges-launch.c              |  2 +-
 18 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/ges/ges-clip.c b/ges/ges-clip.c
index 8218ded74a..d862719534 100644
--- a/ges/ges-clip.c
+++ b/ges/ges-clip.c
@@ -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)
diff --git a/ges/ges-pitivi-formatter.c b/ges/ges-pitivi-formatter.c
index 428022aac3..d8afd52c6e 100644
--- a/ges/ges-pitivi-formatter.c
+++ b/ges/ges-pitivi-formatter.c
@@ -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) {
diff --git a/ges/ges-simple-timeline-layer.c b/ges/ges-simple-timeline-layer.c
index 6579ec9a6c..28b093dd7c 100644
--- a/ges/ges-simple-timeline-layer.c
+++ b/ges/ges-simple-timeline-layer.c
@@ -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.
diff --git a/ges/ges-test-clip.c b/ges/ges-test-clip.c
index e025c438c7..8b0f481038 100644
--- a/ges/ges-test-clip.c
+++ b/ges/ges-test-clip.c
@@ -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
diff --git a/ges/ges-text-overlay-clip.c b/ges/ges-text-overlay-clip.c
index 0073b80a54..b22c0113fb 100644
--- a/ges/ges-text-overlay-clip.c
+++ b/ges/ges-text-overlay-clip.c
@@ -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
diff --git a/ges/ges-timeline-layer.c b/ges/ges-timeline-layer.c
index 1c3ff382f9..a73d92f478 100644
--- a/ges/ges-timeline-layer.c
+++ b/ges/ges-timeline-layer.c
@@ -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.
  */
 
diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c
index bfdc00eb01..3d136d76a4 100644
--- a/ges/ges-timeline.c
+++ b/ges/ges-timeline.c
@@ -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 */
diff --git a/ges/ges-title-clip.c b/ges/ges-title-clip.c
index b7b54ffe62..3000d383b5 100644
--- a/ges/ges-title-clip.c
+++ b/ges/ges-title-clip.c
@@ -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
diff --git a/ges/ges-uri-clip.c b/ges/ges-uri-clip.c
index 4162288959..75083b8872 100644
--- a/ges/ges-uri-clip.c
+++ b/ges/ges-uri-clip.c
@@ -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)
diff --git a/ges/ges.c b/ges/ges.c
index 1aad0d35c6..d59664faec 100644
--- a/ges/ges.c
+++ b/ges/ges.c
@@ -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;
diff --git a/tests/check/ges/basic.c b/tests/check/ges/basic.c
index c39adf4133..a10327f25e 100644
--- a/tests/check/ges/basic.c
+++ b/tests/check/ges/basic.c
@@ -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.
  */
 
diff --git a/tests/check/ges/uriclip.c b/tests/check/ges/uriclip.c
index 9ac452f8b5..7b778c616d 100644
--- a/tests/check/ges/uriclip.c
+++ b/tests/check/ges/uriclip.c
@@ -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);
 
diff --git a/tests/examples/ges-ui.c b/tests/examples/ges-ui.c
index 709e131c0a..90750c644d 100644
--- a/tests/examples/ges-ui.c
+++ b/tests/examples/ges-ui.c
@@ -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,
diff --git a/tests/examples/test1.c b/tests/examples/test1.c
index a86334a346..e14adb480a 100644
--- a/tests/examples/test1.c
+++ b/tests/examples/test1.c
@@ -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 */
diff --git a/tests/examples/test2.c b/tests/examples/test2.c
index bd38394912..be25fc52d5 100644
--- a/tests/examples/test2.c
+++ b/tests/examples/test2.c
@@ -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 */
diff --git a/tests/examples/test3.c b/tests/examples/test3.c
index 024bdcbf0d..fe2528b65d 100644
--- a/tests/examples/test3.c
+++ b/tests/examples/test3.c
@@ -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 */
diff --git a/tests/examples/test4.c b/tests/examples/test4.c
index 9681c28239..b14ac77fa1 100644
--- a/tests/examples/test4.c
+++ b/tests/examples/test4.c
@@ -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 */
diff --git a/tools/ges-launch.c b/tools/ges-launch.c
index 2f2a5e6d7a..c7011959ba 100644
--- a/tools/ges-launch.c
+++ b/tools/ges-launch.c
@@ -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 */