From 48f7a400783ffe45ebabbfb2c1e99dfb1dca10b5 Mon Sep 17 00:00:00 2001
From: Matthieu Crapet <mcrapet@gmail.com>
Date: Mon, 11 Aug 2014 18:21:26 +0200
Subject: [PATCH] tests: fix decodebin signal used in icles/playback/
 decodetest, test and test5

Since release 1.1.4, "new-decoded-pad" no longer exists.
---
 tests/icles/playback/decodetest.c |  6 ++----
 tests/icles/playback/test.c       | 15 +++++++++++----
 tests/icles/playback/test5.c      | 13 +++++++++----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/tests/icles/playback/decodetest.c b/tests/icles/playback/decodetest.c
index 7511fc5f1c..c471dbfb96 100644
--- a/tests/icles/playback/decodetest.c
+++ b/tests/icles/playback/decodetest.c
@@ -71,8 +71,7 @@ state_cb (GstBus * bus, GstMessage * msg, GstElement * pipeline)
 }
 
 static void
-new_decoded_pad_cb (GstElement * decodebin, GstPad * pad, gboolean last,
-    GstElement * pipeline)
+pad_added_cb (GstElement * decodebin, GstPad * pad, GstElement * pipeline)
 {
   GstPadLinkReturn ret;
   GstElement *fakesink;
@@ -149,8 +148,7 @@ main (gint argc, gchar * argv[])
 
   gst_element_link_pads (source, "src", decoder, "sink");
 
-  g_signal_connect (decoder, "new-decoded-pad",
-      G_CALLBACK (new_decoded_pad_cb), pipeline);
+  g_signal_connect (decoder, "pad-added", G_CALLBACK (pad_added_cb), pipeline);
 
   res = gst_element_set_state (pipeline, GST_STATE_PLAYING);
   if (res == GST_STATE_CHANGE_FAILURE) {
diff --git a/tests/icles/playback/test.c b/tests/icles/playback/test.c
index bbb28af3d0..da09fca7e3 100644
--- a/tests/icles/playback/test.c
+++ b/tests/icles/playback/test.c
@@ -37,6 +37,7 @@ gen_video_element (void)
   element = gst_bin_new ("vbin");
   conv = gst_element_factory_make ("videoconvert", "conv");
   sink = gst_element_factory_make (DEFAULT_VIDEOSINK, "sink");
+  g_assert (sink);
 
   gst_bin_add (GST_BIN (element), conv);
   gst_bin_add (GST_BIN (element), sink);
@@ -60,6 +61,7 @@ gen_audio_element (void)
   element = gst_bin_new ("abin");
   conv = gst_element_factory_make ("audioconvert", "conv");
   sink = gst_element_factory_make (DEFAULT_AUDIOSINK, "sink");
+  g_assert (sink);
 
   gst_bin_add (GST_BIN (element), conv);
   gst_bin_add (GST_BIN (element), sink);
@@ -73,7 +75,7 @@ gen_audio_element (void)
 }
 
 static void
-cb_newpad (GstElement * decodebin, GstPad * pad, gboolean last, gpointer data)
+pad_added_cb (GstElement * decodebin, GstPad * pad, gpointer data)
 {
   GstCaps *caps;
   GstStructure *str;
@@ -152,8 +154,8 @@ main (gint argc, gchar * argv[])
   decodebin = gst_element_factory_make ("decodebin", "decodebin");
   g_assert (decodebin);
 
-  g_signal_connect (G_OBJECT (decodebin), "new-decoded-pad",
-      G_CALLBACK (cb_newpad), pipeline);
+  g_signal_connect (G_OBJECT (decodebin), "pad-added",
+      G_CALLBACK (pad_added_cb), pipeline);
 
   gst_bin_add_many (GST_BIN (pipeline), filesrc, decodebin, NULL);
   gst_element_link (filesrc, decodebin);
@@ -162,7 +164,12 @@ main (gint argc, gchar * argv[])
     g_print ("usage: %s <uri>\n", argv[0]);
     exit (-1);
   }
-  g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
+
+  if (!g_str_has_prefix (argv[1], "file://")) {
+    g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
+  } else {
+    g_object_set (G_OBJECT (filesrc), "location", argv[1] + 7, NULL);
+  }
 
   /* set to paused, decodebin will autoplug and signal new_pad callbacks */
   res = gst_element_set_state (pipeline, GST_STATE_PAUSED);
diff --git a/tests/icles/playback/test5.c b/tests/icles/playback/test5.c
index 3be15a1b84..b841116fe1 100644
--- a/tests/icles/playback/test5.c
+++ b/tests/icles/playback/test5.c
@@ -30,7 +30,7 @@
 static GMainLoop *loop;
 
 static void
-new_pad (GstElement * element, GstPad * pad, gboolean last, GstElement * sink)
+pad_added_cb (GstElement * element, GstPad * pad, GstElement * sink)
 {
   g_print ("New pad...\n");
 }
@@ -108,8 +108,8 @@ main (gint argc, gchar * argv[])
   decodebin = gst_element_factory_make ("decodebin", "decodebin");
   g_assert (decodebin);
 
-  g_signal_connect (G_OBJECT (decodebin), "new-decoded-pad",
-      G_CALLBACK (new_pad), NULL);
+  g_signal_connect (G_OBJECT (decodebin), "pad-added",
+      G_CALLBACK (pad_added_cb), NULL);
   g_signal_connect (G_OBJECT (decodebin), "no-more-pads",
       G_CALLBACK (no_more_pads), NULL);
 
@@ -120,7 +120,12 @@ main (gint argc, gchar * argv[])
     g_print ("usage: %s <uri>\n", argv[0]);
     exit (-1);
   }
-  g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
+
+  if (!g_str_has_prefix (argv[1], "file://")) {
+    g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
+  } else {
+    g_object_set (G_OBJECT (filesrc), "location", argv[1] + 7, NULL);
+  }
 
   /* event based programming approach */
   loop = g_main_loop_new (NULL, TRUE);