gnl: Rename media-start as inpoint

Rational described at https://bugzilla.gnome.org/show_bug.cgi?id=701287

8 files changed, 49 insertions, 52 deletions

diff --git a/docs/libs/gnonlin.args b/docs/libs/gnonlin.args
index a5e33cf..697c562 100644
--- a/docs/libs/gnonlin.args
+++ b/docs/libs/gnonlin.args
@@ -49,7 +49,7 @@
 </ARG>
 
 <ARG>
-<NAME>GnlObject::media-start</NAME>
+<NAME>GnlObject::inpoint</NAME>
 <TYPE>guint64</TYPE>
 <RANGE></RANGE>
 <FLAGS>rw</FLAGS>
diff --git a/gnl/gnlcomposition.c b/gnl/gnlcomposition.c
index 6575caa..8faac0a 100644
--- a/gnl/gnlcomposition.c
+++ b/gnl/gnlcomposition.c
@@ -2516,7 +2516,7 @@ are_same_stacks (GNode * stack1, GNode * stack2)
 {
   gboolean res = FALSE;
 
-  /* TODO : FIXME : we should also compare start/media-start */
+  /* TODO : FIXME : we should also compare start/inpoint */
   /* stacks are not equal if one of them is NULL but not the other */
   if ((!stack1 && stack2) || (stack1 && !stack2))
     goto beach;
@@ -2949,7 +2949,7 @@ gnl_composition_add_object (GstBin * bin, GstElement * element)
     /* We set the default source start/stop values to 0 and composition-stop */
     g_object_set (element,
         "start", (GstClockTime) 0,
-        "media-start", (GstClockTime) 0,
+        "inpoint", (GstClockTime) 0,
         "duration", (GstClockTimeDiff) GNL_OBJECT_STOP (comp),
         "media-duration", (GstClockTimeDiff) GNL_OBJECT_STOP (comp), NULL);
   }
diff --git a/gnl/gnlghostpad.c b/gnl/gnlghostpad.c
index c275fd5..0e88206 100644
--- a/gnl/gnlghostpad.c
+++ b/gnl/gnlghostpad.c
@@ -80,8 +80,8 @@ translate_incoming_seek (GnlObject * object, GstEvent * event)
     GST_LOG_OBJECT (object, "Setting cur to %" GST_TIME_FORMAT,
         GST_TIME_ARGS (ncur));
   } else if ((curtype != GST_SEEK_TYPE_NONE)) {
-    GST_DEBUG_OBJECT (object, "Limiting seek start to media_start");
-    ncur = object->media_start;
+    GST_DEBUG_OBJECT (object, "Limiting seek start to inpoint");
+    ncur = object->inpoint;
   } else {
     GST_DEBUG_OBJECT (object, "leaving GST_SEEK_TYPE_NONE");
     ncur = cur;
diff --git a/gnl/gnlobject.c b/gnl/gnlobject.c
index 5c60a2e..d89899f 100644
--- a/gnl/gnlobject.c
+++ b/gnl/gnlobject.c
@@ -52,7 +52,7 @@ enum
   PROP_START,
   PROP_DURATION,
   PROP_STOP,
-  PROP_MEDIA_START,
+  PROP_INPOINT,
   PROP_MEDIA_DURATION,
   PROP_MEDIA_STOP,
   PROP_RATE,
@@ -137,19 +137,19 @@ gnl_object_class_init (GnlObjectClass * klass)
       properties[PROP_STOP]);
 
   /**
-   * GnlObject:media_start
+   * GnlObject:inpoint
    *
    * The media start position in nanoseconds.
    *
    * Also called 'in-point' in video-editing, this corresponds to
    * what position in the 'contained' object we should start outputting from.
    */
-  properties[PROP_MEDIA_START] =
-      g_param_spec_uint64 ("media_start", "Media start",
+  properties[PROP_INPOINT] =
+      g_param_spec_uint64 ("inpoint", "Media start",
       "The media start position (in nanoseconds)", 0, G_MAXUINT64,
       GST_CLOCK_TIME_NONE, G_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class, PROP_MEDIA_START,
-      properties[PROP_MEDIA_START]);
+  g_object_class_install_property (gobject_class, PROP_INPOINT,
+      properties[PROP_INPOINT]);
 
   /**
    * GnlObject:media_duration
@@ -174,7 +174,7 @@ gnl_object_class_init (GnlObjectClass * klass)
    * Also called 'out-point' in video-editing, this corresponds to the
    * position in the 'contained' object we should output until.
    *
-   * This value is read-only, and is computed from the media_start and
+   * This value is read-only, and is computed from the inpoint and
    * media_duration property.
    */
   properties[PROP_MEDIA_STOP] = g_param_spec_uint64 ("media_stop", "Media stop",
@@ -265,7 +265,7 @@ gnl_object_init (GnlObject * object)
   object->duration = 0;
   object->stop = 0;
 
-  object->media_start = GST_CLOCK_TIME_NONE;
+  object->inpoint = GST_CLOCK_TIME_NONE;
   object->media_duration = 0;
   object->media_stop = GST_CLOCK_TIME_NONE;
 
@@ -319,13 +319,12 @@ gnl_object_to_media_time (GnlObject * object, GstClockTime otime,
       "Media [%" GST_TIME_FORMAT " -- %" GST_TIME_FORMAT "]",
       GST_TIME_ARGS (object->start),
       GST_TIME_ARGS (object->stop),
-      GST_TIME_ARGS (object->media_start), GST_TIME_ARGS (object->media_stop));
+      GST_TIME_ARGS (object->inpoint), GST_TIME_ARGS (object->media_stop));
 
   /* limit check */
   if (G_UNLIKELY ((otime < object->start))) {
     GST_DEBUG_OBJECT (object, "ObjectTime is before start");
-    *mtime =
-        (object->media_start == GST_CLOCK_TIME_NONE) ? 0 : object->media_start;
+    *mtime = (object->inpoint == GST_CLOCK_TIME_NONE) ? 0 : object->inpoint;
     return FALSE;
   }
 
@@ -333,20 +332,20 @@ gnl_object_to_media_time (GnlObject * object, GstClockTime otime,
     GST_DEBUG_OBJECT (object, "ObjectTime is after stop");
     if (G_LIKELY (GST_CLOCK_TIME_IS_VALID (object->media_stop)))
       *mtime = object->media_stop;
-    else if (GST_CLOCK_TIME_IS_VALID (object->media_start))
-      *mtime = object->media_start + object->duration;
+    else if (GST_CLOCK_TIME_IS_VALID (object->inpoint))
+      *mtime = object->inpoint + object->duration;
     else
       *mtime = object->stop - object->start;
     return FALSE;
   }
 
-  if (G_UNLIKELY (object->media_start == GST_CLOCK_TIME_NONE)) {
+  if (G_UNLIKELY (object->inpoint == GST_CLOCK_TIME_NONE)) {
     /* no time shifting, for live sources ? */
     *mtime = otime - object->start;
   } else if (G_LIKELY (object->rate_1)) {
-    *mtime = otime - object->start + object->media_start;
+    *mtime = otime - object->start + object->inpoint;
   } else {
-    *mtime = (otime - object->start) * object->rate + object->media_start;
+    *mtime = (otime - object->start) * object->rate + object->inpoint;
   }
 
   GST_DEBUG_OBJECT (object, "Returning MediaTime : %" GST_TIME_FORMAT,
@@ -381,14 +380,13 @@ gnl_media_to_object_time (GnlObject * object, GstClockTime mtime,
       "Media [%" GST_TIME_FORMAT " -- %" GST_TIME_FORMAT "]",
       GST_TIME_ARGS (object->start),
       GST_TIME_ARGS (object->stop),
-      GST_TIME_ARGS (object->media_start), GST_TIME_ARGS (object->media_stop));
+      GST_TIME_ARGS (object->inpoint), GST_TIME_ARGS (object->media_stop));
 
 
   /* limit check */
-  if (G_UNLIKELY ((object->media_start != GST_CLOCK_TIME_NONE)
-          && (mtime < object->media_start))) {
-    GST_DEBUG_OBJECT (object,
-        "media time is before media_start, forcing to start");
+  if (G_UNLIKELY ((object->inpoint != GST_CLOCK_TIME_NONE)
+          && (mtime < object->inpoint))) {
+    GST_DEBUG_OBJECT (object, "media time is before inpoint, forcing to start");
     *otime = object->start;
     return FALSE;
   }
@@ -401,12 +399,12 @@ gnl_media_to_object_time (GnlObject * object, GstClockTime mtime,
     return FALSE;
   }
 
-  if (G_LIKELY (object->rate_1 && (object->media_start != GST_CLOCK_TIME_NONE))) {
-    *otime = mtime - object->media_start + object->start;
-  } else if (object->media_start == GST_CLOCK_TIME_NONE)
+  if (G_LIKELY (object->rate_1 && (object->inpoint != GST_CLOCK_TIME_NONE))) {
+    *otime = mtime - object->inpoint + object->start;
+  } else if (object->inpoint == GST_CLOCK_TIME_NONE)
     *otime = mtime + object->start;
   else
-    *otime = (mtime - object->media_start) / object->rate + object->start;
+    *otime = (mtime - object->inpoint) / object->rate + object->start;
 
   GST_DEBUG_OBJECT (object, "Returning ObjectTime : %" GST_TIME_FORMAT,
       GST_TIME_ARGS (*otime));
@@ -482,14 +480,14 @@ update_values (GnlObject * object)
   }
 
   /* check if media start/duration has changed */
-  if ((object->media_start != GST_CLOCK_TIME_NONE)
-      && ((object->media_start + object->media_duration) != object->media_stop)) {
-    object->media_stop = object->media_start + object->media_duration;
+  if ((object->inpoint != GST_CLOCK_TIME_NONE)
+      && ((object->inpoint + object->media_duration) != object->media_stop)) {
+    object->media_stop = object->inpoint + object->media_duration;
     GST_LOG_OBJECT (object,
         "Updated media_stop value : %" GST_TIME_FORMAT
         " [mstart:%" GST_TIME_FORMAT ", mduration:%" GST_TIME_FORMAT "]",
         GST_TIME_ARGS (object->media_stop),
-        GST_TIME_ARGS (object->media_start),
+        GST_TIME_ARGS (object->inpoint),
         GST_TIME_ARGS (object->media_duration));
     g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_MEDIA_STOP]);
   }
@@ -529,8 +527,8 @@ gnl_object_set_property (GObject * object, guint prop_id,
       gnlobject->duration = g_value_get_int64 (value);
       update_values (gnlobject);
       break;
-    case PROP_MEDIA_START:
-      gnlobject->media_start = g_value_get_uint64 (value);
+    case PROP_INPOINT:
+      gnlobject->inpoint = g_value_get_uint64 (value);
       break;
     case PROP_MEDIA_DURATION:
       gnlobject->media_duration = g_value_get_int64 (value);
@@ -573,8 +571,8 @@ gnl_object_get_property (GObject * object, guint prop_id,
     case PROP_STOP:
       g_value_set_uint64 (value, gnlobject->stop);
       break;
-    case PROP_MEDIA_START:
-      g_value_set_uint64 (value, gnlobject->media_start);
+    case PROP_INPOINT:
+      g_value_set_uint64 (value, gnlobject->inpoint);
       break;
     case PROP_MEDIA_DURATION:
       g_value_set_int64 (value, gnlobject->media_duration);
diff --git a/gnl/gnlobject.h b/gnl/gnlobject.h
index 42b4aba..d9bf966 100644
--- a/gnl/gnlobject.h
+++ b/gnl/gnlobject.h
@@ -72,7 +72,7 @@ typedef enum
 #define GNL_OBJECT_START(obj) (GNL_OBJECT_CAST (obj)->start)
 #define GNL_OBJECT_STOP(obj) (GNL_OBJECT_CAST (obj)->stop)
 #define GNL_OBJECT_DURATION(obj) (GNL_OBJECT_CAST (obj)->duration)
-#define GNL_OBJECT_MEDIA_START(obj) (GNL_OBJECT_CAST (obj)->media_start)
+#define GNL_OBJECT_INPOINT(obj) (GNL_OBJECT_CAST (obj)->inpoint)
 #define GNL_OBJECT_MEDIA_STOP(obj) (GNL_OBJECT_CAST (obj)->media_stop)
 #define GNL_OBJECT_MEDIA_DURATION(obj) (GNL_OBJECT_CAST (obj)->media_duration)
 #define GNL_OBJECT_PRIORITY(obj) (GNL_OBJECT_CAST (obj)->priority)
@@ -88,7 +88,7 @@ struct _GnlObject
   /* read-only */
   GstClockTime stop;
 
-  GstClockTime media_start;
+  GstClockTime inpoint;
   GstClockTimeDiff media_duration;
 
   /* read-only */
diff --git a/tests/check/gnl/common.c b/tests/check/gnl/common.c
index 479f7ab..5d419a8 100644
--- a/tests/check/gnl/common.c
+++ b/tests/check/gnl/common.c
@@ -168,8 +168,7 @@ new_gnl_src (const gchar * name, guint64 start, gint64 duration, gint priority)
   g_object_set (G_OBJECT (gnlsource),
       "start", start,
       "duration", duration,
-      "media-start", start,
-      "media-duration", duration, "priority", priority, NULL);
+      "inpoint", start, "media-duration", duration, "priority", priority, NULL);
 
   return gnlsource;
 }
@@ -200,14 +199,14 @@ videotest_gnl_src (const gchar * name, guint64 start, gint64 duration,
 
 GstElement *
 videotest_gnl_src_full (const gchar * name, guint64 start, gint64 duration,
-    guint64 mediastart, gint64 mediaduration, gint pattern, guint priority)
+    guint64 inpoint, gint64 mediaduration, gint pattern, guint priority)
 {
   GstElement *gnls;
 
   gnls = videotest_gnl_src (name, start, duration, pattern, priority);
   if (gnls) {
     g_object_set (G_OBJECT (gnls),
-        "media-start", mediastart, "media-duration", mediaduration, NULL);
+        "inpoint", inpoint, "media-duration", mediaduration, NULL);
   }
 
   return gnls;
diff --git a/tests/check/gnl/common.h b/tests/check/gnl/common.h
index 6a2a0ef..64d7b75 100644
--- a/tests/check/gnl/common.h
+++ b/tests/check/gnl/common.h
@@ -54,7 +54,7 @@ GstPadProbeReturn sinkpad_probe (GstPad *sinkpad, GstPadProbeInfo * info, Collec
 GstElement *videotest_gnl_src (const gchar * name, guint64 start, gint64 duration,
 			       gint pattern, guint priority);
 GstElement * videotest_gnl_src_full (const gchar * name, guint64 start, gint64 duration,
-				     guint64 mediastart, gint64 mediaduration,
+				     guint64 inpoint, gint64 mediaduration,
 				     gint pattern, guint priority);
 GstElement *
 videotest_in_bin_gnl_src (const gchar * name, guint64 start, gint64 duration, gint pattern, guint priority);
diff --git a/tests/check/gnl/gnlcomposition.c b/tests/check/gnl/gnlcomposition.c
index 5a2c372..c37e586 100644
--- a/tests/check/gnl/gnlcomposition.c
+++ b/tests/check/gnl/gnlcomposition.c
@@ -310,7 +310,7 @@ GST_START_TEST (test_no_more_pads_race)
   fail_unless (videomixer != NULL);
   gst_bin_add (GST_BIN (operation), videomixer);
   g_object_set (operation, "start", 0 * GST_SECOND, "duration", 10 * GST_SECOND,
-      "media-start", 0 * GST_SECOND, "media-duration", 10 * GST_SECOND,
+      "inpoint", 0 * GST_SECOND, "media-duration", 10 * GST_SECOND,
       "priority", 10, NULL);
   gst_bin_add (GST_BIN (composition), operation);
 
@@ -319,7 +319,7 @@ GST_START_TEST (test_no_more_pads_race)
   videotestsrc1 = gst_element_factory_make ("videotestsrc", "videotestsrc1");
   gst_bin_add (GST_BIN (source1), videotestsrc1);
   g_object_set (source1, "start", 0 * GST_SECOND, "duration", 5 * GST_SECOND,
-      "media-start", 0 * GST_SECOND, "media-duration", 5 * GST_SECOND,
+      "inpoint", 0 * GST_SECOND, "media-duration", 5 * GST_SECOND,
       "priority", 20, NULL);
 
   /* source2 */
@@ -333,7 +333,7 @@ GST_START_TEST (test_no_more_pads_race)
   gst_bin_add (bin, videotestsrc2);
   gst_bin_add (GST_BIN (source2), GST_ELEMENT (bin));
   g_object_set (source2, "start", 0 * GST_SECOND, "duration", 5 * GST_SECOND,
-      "media-start", 0 * GST_SECOND, "media-duration", 5 * GST_SECOND,
+      "inpoint", 0 * GST_SECOND, "media-duration", 5 * GST_SECOND,
       "priority", 20, NULL);
 
   /* source3 */
@@ -341,7 +341,7 @@ GST_START_TEST (test_no_more_pads_race)
   videotestsrc2 = gst_element_factory_make ("videotestsrc", "videotestsrc3");
   gst_bin_add (GST_BIN (source3), videotestsrc2);
   g_object_set (source3, "start", 0 * GST_SECOND, "duration", 5 * GST_SECOND,
-      "media-start", 0 * GST_SECOND, "media-duration", 5 * GST_SECOND,
+      "inpoint", 0 * GST_SECOND, "media-duration", 5 * GST_SECOND,
       "priority", 20, NULL);
 
   closure.composition = composition;
@@ -423,7 +423,7 @@ GST_START_TEST (test_simple_adder)
   fail_unless (adder != NULL);
   gst_bin_add (GST_BIN (gnl_adder), adder);
   g_object_set (gnl_adder, "start", 0 * GST_SECOND, "duration", total_time,
-      "media-start", 0 * GST_SECOND, "media-duration", total_time,
+      "inpoint", 0 * GST_SECOND, "media-duration", total_time,
       "priority", 0, NULL);
   gst_bin_add (GST_BIN (composition), gnl_adder);
 
@@ -432,7 +432,7 @@ GST_START_TEST (test_simple_adder)
   audiotestsrc1 = gst_element_factory_make ("audiotestsrc", "audiotestsrc1");
   gst_bin_add (GST_BIN (gnlsource1), audiotestsrc1);
   g_object_set (gnlsource1, "start", 0 * GST_SECOND, "duration",
-      total_time / 2, "media-start", 0 * GST_SECOND, "media-duration",
+      total_time / 2, "inpoint", 0 * GST_SECOND, "media-duration",
       total_time / 2, "priority", 1, NULL);
   fail_unless (gst_bin_add (GST_BIN (composition), gnlsource1));
 
@@ -441,7 +441,7 @@ GST_START_TEST (test_simple_adder)
   audiotestsrc2 = gst_element_factory_make ("audiotestsrc", "audiotestsrc2");
   gst_bin_add (GST_BIN (gnlsource2), GST_ELEMENT (audiotestsrc2));
   g_object_set (gnlsource2, "start", 0 * GST_SECOND, "duration", total_time,
-      "media-start", 0 * GST_SECOND, "media-duration", total_time,
+      "inpoint", 0 * GST_SECOND, "media-duration", total_time,
       "priority", 2, NULL);
   fail_unless (gst_bin_add (GST_BIN (composition), gnlsource2));