gnl: Remove the notion of media-duration

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

5 files changed, 21 insertions, 34 deletions

diff --git a/tests/check/gnl/common.c b/tests/check/gnl/common.c
index 5d419a8..7b21a00 100644
--- a/tests/check/gnl/common.c
+++ b/tests/check/gnl/common.c
@@ -167,8 +167,7 @@ new_gnl_src (const gchar * name, guint64 start, gint64 duration, gint priority)
 
   g_object_set (G_OBJECT (gnlsource),
       "start", start,
-      "duration", duration,
-      "inpoint", start, "media-duration", duration, "priority", priority, NULL);
+      "duration", duration, "inpoint", start, "priority", priority, NULL);
 
   return gnlsource;
 }
@@ -199,14 +198,13 @@ videotest_gnl_src (const gchar * name, guint64 start, gint64 duration,
 
 GstElement *
 videotest_gnl_src_full (const gchar * name, guint64 start, gint64 duration,
-    guint64 inpoint, gint64 mediaduration, gint pattern, guint priority)
+    guint64 inpoint, gint pattern, guint priority)
 {
   GstElement *gnls;
 
   gnls = videotest_gnl_src (name, start, duration, pattern, priority);
   if (gnls) {
-    g_object_set (G_OBJECT (gnls),
-        "inpoint", inpoint, "media-duration", mediaduration, NULL);
+    g_object_set (G_OBJECT (gnls), "inpoint", inpoint, NULL);
   }
 
   return gnls;
diff --git a/tests/check/gnl/common.h b/tests/check/gnl/common.h
index 64d7b75..7e0b3b5 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 inpoint, gint64 mediaduration,
+				     guint64 inpoint,
 				     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 c37e586..5353409 100644
--- a/tests/check/gnl/gnlcomposition.c
+++ b/tests/check/gnl/gnlcomposition.c
@@ -310,8 +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,
-      "inpoint", 0 * GST_SECOND, "media-duration", 10 * GST_SECOND,
-      "priority", 10, NULL);
+      "inpoint", 0 * GST_SECOND, "priority", 10, NULL);
   gst_bin_add (GST_BIN (composition), operation);
 
   /* source 1 */
@@ -319,8 +318,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,
-      "inpoint", 0 * GST_SECOND, "media-duration", 5 * GST_SECOND,
-      "priority", 20, NULL);
+      "inpoint", 0 * GST_SECOND, "priority", 20, NULL);
 
   /* source2 */
   source2 = gst_element_factory_make ("gnlsource", "source2");
@@ -333,16 +331,14 @@ 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,
-      "inpoint", 0 * GST_SECOND, "media-duration", 5 * GST_SECOND,
-      "priority", 20, NULL);
+      "inpoint", 0 * GST_SECOND, "priority", 20, NULL);
 
   /* source3 */
   source3 = gst_element_factory_make ("gnlsource", "source3");
   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,
-      "inpoint", 0 * GST_SECOND, "media-duration", 5 * GST_SECOND,
-      "priority", 20, NULL);
+      "inpoint", 0 * GST_SECOND, "priority", 20, NULL);
 
   closure.composition = composition;
   closure.source3 = source3;
@@ -423,8 +419,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,
-      "inpoint", 0 * GST_SECOND, "media-duration", total_time,
-      "priority", 0, NULL);
+      "inpoint", 0 * GST_SECOND, "priority", 0, NULL);
   gst_bin_add (GST_BIN (composition), gnl_adder);
 
   /* source 1 */
@@ -432,8 +427,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, "inpoint", 0 * GST_SECOND, "media-duration",
-      total_time / 2, "priority", 1, NULL);
+      total_time / 2, "inpoint", 0, "priority", 1, NULL);
   fail_unless (gst_bin_add (GST_BIN (composition), gnlsource1));
 
   /* gnlsource2 */
@@ -441,8 +435,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,
-      "inpoint", 0 * GST_SECOND, "media-duration", total_time,
-      "priority", 2, NULL);
+      "inpoint", 0 * GST_SECOND, "priority", 2, NULL);
   fail_unless (gst_bin_add (GST_BIN (composition), gnlsource2));
 
   /* Connecting signals */
diff --git a/tests/check/gnl/seek.c b/tests/check/gnl/seek.c
index f6f3c93..fa6b724 100644
--- a/tests/check/gnl/seek.c
+++ b/tests/check/gnl/seek.c
@@ -170,12 +170,11 @@ test_simplest_full (void)
      Start : 0s
      Duration : 1s
      Media start : 5s
-     Media Duartion : 1s
      Priority : 1
    */
   source1 =
-      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND,
-      1 * GST_SECOND, 3, 1);
+      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND, 3,
+      1);
   fail_if (source1 == NULL);
   check_start_stop_duration (source1, 0, 1 * GST_SECOND, 1 * GST_SECOND);
 
@@ -241,12 +240,11 @@ test_one_after_other_full (void)
      Start : 0s
      Duration : 1s
      Media start : 5s
-     Media Duartion : 1s
      Priority : 1
    */
   source1 =
-      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND,
-      1 * GST_SECOND, 3, 1);
+      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND, 3,
+      1);
   fail_if (source1 == NULL);
   check_start_stop_duration (source1, 0, 1 * GST_SECOND, 1 * GST_SECOND);
 
@@ -255,11 +253,10 @@ test_one_after_other_full (void)
      Start : 1s
      Duration : 1s
      Media start : 2s
-     Media Duration : 1s
      Priority : 1
    */
   source2 = videotest_gnl_src_full ("source2", 1 * GST_SECOND, 1 * GST_SECOND,
-      2 * GST_SECOND, 1 * GST_SECOND, 2, 1);
+      2 * GST_SECOND, 2, 1);
   fail_if (source2 == NULL);
   check_start_stop_duration (source2, 1 * GST_SECOND, 2 * GST_SECOND,
       1 * GST_SECOND);
diff --git a/tests/check/gnl/simple.c b/tests/check/gnl/simple.c
index 14b269f..93fce7b 100644
--- a/tests/check/gnl/simple.c
+++ b/tests/check/gnl/simple.c
@@ -27,8 +27,8 @@ test_simplest_full (gboolean async)
      Priority : 1
    */
   source1 =
-      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND,
-      1 * GST_SECOND, 3, 1);
+      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND, 3,
+      1);
   fail_if (source1 == NULL);
   check_start_stop_duration (source1, 0, 1 * GST_SECOND, 1 * GST_SECOND);
 
@@ -211,8 +211,8 @@ test_one_after_other_full (gboolean async)
      Priority : 1
    */
   source1 =
-      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND,
-      1 * GST_SECOND, 3, 1);
+      videotest_gnl_src_full ("source1", 0, 1 * GST_SECOND, 5 * GST_SECOND, 3,
+      1);
   fail_if (source1 == NULL);
   check_start_stop_duration (source1, 0, 1 * GST_SECOND, 1 * GST_SECOND);
 
@@ -221,11 +221,10 @@ test_one_after_other_full (gboolean async)
      Start : 1s
      Duration : 1s
      Media start : 2s
-     Media Duration : 1s
      Priority : 1
    */
   source2 = videotest_gnl_src_full ("source2", 1 * GST_SECOND, 1 * GST_SECOND,
-      2 * GST_SECOND, 1 * GST_SECOND, 2, 1);
+      2 * GST_SECOND, 2, 1);
   fail_if (source2 == NULL);
   check_start_stop_duration (source2, 1 * GST_SECOND, 2 * GST_SECOND,
       1 * GST_SECOND);