[libdmapsharing] Use decodebin2 instead of decodebin Signed-off-by: W. Michael Petullo <mike flyn org>

[W. Michael Petullo <wmpetullo src gnome org>]

commit 8b7935bfede0564f51aa9f92fbdaf11c9c0d9261
Author: W. Michael Petullo <mike flyn org>
Date:   Sun Jul 3 21:09:16 2011 -0500

    Use decodebin2 instead of decodebin
    Signed-off-by: W. Michael Petullo <mike flyn org>

 TODO                                       |    3 ---
 libdmapsharing/dmap-gst-mp3-input-stream.c |   14 +++++++-------
 libdmapsharing/dmap-gst-wav-input-stream.c |   14 +++++++-------
 3 files changed, 14 insertions(+), 17 deletions(-)
---
diff --git a/TODO b/TODO
index f5ccc48..c2e9d72 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,7 @@
 = Short term ===================================================================
 
-Use decodebin2, see dmapd.
-
 Noah: DNS-SD implementation
 	Finish browser side support.
-	Update MacPorts port to no longer require avahi.
 
 Documentation:
 	Improve content (Noah?)
diff --git a/libdmapsharing/dmap-gst-mp3-input-stream.c b/libdmapsharing/dmap-gst-mp3-input-stream.c
index 49ffb5f..d163095 100644
--- a/libdmapsharing/dmap-gst-mp3-input-stream.c
+++ b/libdmapsharing/dmap-gst-mp3-input-stream.c
@@ -43,11 +43,11 @@ void dmap_gst_input_stream_new_buffer_cb (GstElement * element,
 					  DMAPGstInputStream * stream);
 
 static void
-new_decoded_pad_cb (GstElement * element,
-		    GstPad * pad,
-		    gboolean arg, DMAPGstMP3InputStream * stream)
+pad_added_cb (GstElement * element,
+              GstPad * pad,
+              DMAPGstMP3InputStream * stream)
 {
-	/* Link remaining pad after decodebin does its magic. */
+	/* Link remaining pad after decodebin2 does its magic. */
 	GstPad *conv_pad;
 
 	conv_pad = gst_element_get_static_pad (stream->priv->convert, "sink");
@@ -88,7 +88,7 @@ dmap_gst_mp3_input_stream_new (GInputStream * src_stream)
 	g_assert (GST_IS_ELEMENT (stream->priv->src));
 
 	stream->priv->decode =
-		gst_element_factory_make ("decodebin", "decode");
+		gst_element_factory_make ("decodebin2", "decode");
 	g_assert (GST_IS_ELEMENT (stream->priv->decode));
 
 	stream->priv->convert =
@@ -120,8 +120,8 @@ dmap_gst_mp3_input_stream_new (GInputStream * src_stream)
 	g_object_set (G_OBJECT (stream->priv->encode), "quality", 9, NULL);
 	g_object_set (G_OBJECT (stream->priv->encode), "bitrate", 128, NULL);
 	g_object_set (G_OBJECT (stream->priv->encode), "vbr", 0, NULL);
-	g_signal_connect (stream->priv->decode, "new-decoded-pad",
-			  G_CALLBACK (new_decoded_pad_cb), stream);
+	g_signal_connect (stream->priv->decode, "pad-added",
+			  G_CALLBACK (pad_added_cb), stream);
 
 	g_object_set (G_OBJECT (stream->priv->sink), "emit-signals", TRUE,
 		      "sync", FALSE, NULL);
diff --git a/libdmapsharing/dmap-gst-wav-input-stream.c b/libdmapsharing/dmap-gst-wav-input-stream.c
index 7f97fac..8f8afd8 100644
--- a/libdmapsharing/dmap-gst-wav-input-stream.c
+++ b/libdmapsharing/dmap-gst-wav-input-stream.c
@@ -44,11 +44,11 @@ void dmap_gst_input_stream_new_buffer_cb (GstElement * element,
 					  DMAPGstInputStream * stream);
 
 static void
-new_decoded_pad_cb (GstElement * element,
-		    GstPad * pad,
-		    gboolean arg, DMAPGstWAVInputStream * stream)
+pad_added_cb (GstElement * element,
+              GstPad * pad,
+              DMAPGstWAVInputStream * stream)
 {
-	/* Link remaining pad after decodebin does its magic. */
+	/* Link remaining pad after decodebin2 does its magic. */
 	GstPad *conv_pad;
 
 	conv_pad = gst_element_get_static_pad (stream->priv->convert, "sink");
@@ -94,7 +94,7 @@ dmap_gst_wav_input_stream_new (GInputStream * src_stream)
 	g_assert (GST_IS_ELEMENT (stream->priv->src));
 
 	stream->priv->decode =
-		gst_element_factory_make ("decodebin", "decode");
+		gst_element_factory_make ("decodebin2", "decode");
 	g_assert (GST_IS_ELEMENT (stream->priv->decode));
 
 	stream->priv->convert =
@@ -127,8 +127,8 @@ dmap_gst_wav_input_stream_new (GInputStream * src_stream)
 	g_object_set (G_OBJECT (stream->priv->src), "stream", src_stream,
 		      NULL);
 
-	g_signal_connect (stream->priv->decode, "new-decoded-pad",
-			  G_CALLBACK (new_decoded_pad_cb), stream);
+	g_signal_connect (stream->priv->decode, "pad-added",
+			  G_CALLBACK (pad_added_cb), stream);
 
 	g_object_set (G_OBJECT (stream->priv->sink), "emit-signals", TRUE,
 		      "sync", FALSE, NULL);