From 57fe2addef1849ab98ef67148e8679fa94550b93 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 3 Nov 2011 17:58:57 +0100
Subject: [PATCH] update for request pads change.

---
 gst/playback/gstdecodebin2.c          | 2 +-
 gst/playback/gstplaybin2.c            | 2 +-
 gst/playback/gstplaysink.c            | 4 ++--
 tests/examples/dynamic/codec-select.c | 6 +++---
 tests/icles/output-selector-test.c    | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 059aefd207..761e63ab80 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -2968,7 +2968,7 @@ gst_decode_group_control_demuxer_pad (GstDecodeGroup * group, GstPad * pad)
   if (G_UNLIKELY (!group->multiqueue))
     return NULL;
 
-  if (!(sinkpad = gst_element_get_request_pad (group->multiqueue, "sink%d"))) {
+  if (!(sinkpad = gst_element_get_request_pad (group->multiqueue, "sink_%u"))) {
     GST_ERROR_OBJECT (dbin, "Couldn't get sinkpad from multiqueue");
     return NULL;
   }
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index acbfef96db..9dfe10c8f5 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -2595,7 +2595,7 @@ pad_added_cb (GstElement * decodebin, GstPad * pad, GstSourceGroup * group)
 
   /* get sinkpad for the new stream */
   if (select->selector) {
-    if ((sinkpad = gst_element_get_request_pad (select->selector, "sink%d"))) {
+    if ((sinkpad = gst_element_get_request_pad (select->selector, "sink_%u"))) {
       gulong notify_tags_handler = 0;
       NotifyTagsData *ntdata;
 
diff --git a/gst/playback/gstplaysink.c b/gst/playback/gstplaysink.c
index 848ffb3137..5a3db6757d 100644
--- a/gst/playback/gstplaysink.c
+++ b/gst/playback/gstplaysink.c
@@ -2435,7 +2435,7 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
       GST_DEBUG_OBJECT (playsink, "adding audio chain");
       if (playsink->audio_tee_asrc == NULL) {
         playsink->audio_tee_asrc =
-            gst_element_get_request_pad (playsink->audio_tee, "src%d");
+            gst_element_get_request_pad (playsink->audio_tee, "src_%u");
       }
       add_chain (GST_PLAY_CHAIN (playsink->audiochain), TRUE);
       activate_chain (GST_PLAY_CHAIN (playsink->audiochain), TRUE);
@@ -2497,7 +2497,7 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
       activate_chain (GST_PLAY_CHAIN (playsink->vischain), TRUE);
       if (playsink->audio_tee_vissrc == NULL) {
         playsink->audio_tee_vissrc =
-            gst_element_get_request_pad (playsink->audio_tee, "src%d");
+            gst_element_get_request_pad (playsink->audio_tee, "src_%u");
       }
       gst_pad_link_full (playsink->audio_tee_vissrc,
           playsink->vischain->sinkpad, GST_PAD_LINK_CHECK_NOTHING);
diff --git a/tests/examples/dynamic/codec-select.c b/tests/examples/dynamic/codec-select.c
index 2d8f9fac39..9018a0842c 100644
--- a/tests/examples/dynamic/codec-select.c
+++ b/tests/examples/dynamic/codec-select.c
@@ -180,14 +180,14 @@ make_pipeline (void)
 
     gst_bin_add (GST_BIN (result), encoder);
 
-    srcpad = gst_element_get_request_pad (outputselect, "src%d");
+    srcpad = gst_element_get_request_pad (outputselect, "src_%u");
     sinkpad = gst_element_get_static_pad (encoder, "sink");
     gst_pad_link (srcpad, sinkpad);
     gst_object_unref (srcpad);
     gst_object_unref (sinkpad);
 
     srcpad = gst_element_get_static_pad (encoder, "src");
-    sinkpad = gst_element_get_request_pad (inputselect, "sink%d");
+    sinkpad = gst_element_get_request_pad (inputselect, "sink_%u");
     gst_pad_link (srcpad, sinkpad);
     gst_object_unref (srcpad);
     gst_object_unref (sinkpad);
@@ -212,7 +212,7 @@ do_switch (GstElement * pipeline)
   select = gst_bin_get_by_name (GST_BIN (pipeline), "select");
 
   /* get the named pad */
-  name = g_strdup_printf ("src%d", rand);
+  name = g_strdup_printf ("src_%u", rand);
   pad = gst_element_get_static_pad (select, name);
   g_free (name);
 
diff --git a/tests/icles/output-selector-test.c b/tests/icles/output-selector-test.c
index 6d9b94e9a1..cc9cf7ef9c 100644
--- a/tests/icles/output-selector-test.c
+++ b/tests/icles/output-selector-test.c
@@ -124,7 +124,7 @@ main (gint argc, gchar * argv[])
 
   /* link output 1 */
   sinkpad = gst_element_get_static_pad (c1, "sink");
-  osel_src1 = gst_element_get_request_pad (osel, "src%d");
+  osel_src1 = gst_element_get_request_pad (osel, "src_%u");
   if (gst_pad_link (osel_src1, sinkpad) != GST_PAD_LINK_OK) {
     g_print ("linking output 1 converter failed\n");
     return -1;
@@ -138,7 +138,7 @@ main (gint argc, gchar * argv[])
 
   /* link output 2 */
   sinkpad = gst_element_get_static_pad (c2, "sink");
-  osel_src2 = gst_element_get_request_pad (osel, "src%d");
+  osel_src2 = gst_element_get_request_pad (osel, "src_%u");
   if (gst_pad_link (osel_src2, sinkpad) != GST_PAD_LINK_OK) {
     g_print ("linking output 2 converter failed\n");
     return -1;