|
 |
8dae9dd |
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
|
|
|
8dae9dd |
Date: Tue, 28 May 2013 11:36:04 +0200
|
|
|
8dae9dd |
Subject: Don't use the new-decoded-pad signal of decodebin
|
|
|
8dae9dd |
|
|
|
8dae9dd |
It is not available anymore in 1.0 and pad-added should be used.
|
|
|
8dae9dd |
---
|
|
|
8dae9dd |
libbanshee/banshee-bpmdetector.c | 8 ++++----
|
|
|
8dae9dd |
libbanshee/banshee-transcoder.c | 8 ++++----
|
|
|
8dae9dd |
2 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
8dae9dd |
|
|
|
8dae9dd |
diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c
|
|
|
8dae9dd |
index 68b0419..131d2e5 100644
|
|
|
8dae9dd |
--- a/libbanshee/banshee-bpmdetector.c
|
|
|
8dae9dd |
+++ b/libbanshee/banshee-bpmdetector.c
|
|
|
8dae9dd |
@@ -159,8 +159,8 @@ bbd_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer data)
|
|
|
8dae9dd |
}
|
|
|
8dae9dd |
|
|
|
8dae9dd |
static void
|
|
|
8dae9dd |
-bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad,
|
|
|
8dae9dd |
- gboolean last, gpointer data)
|
|
|
8dae9dd |
+bbd_pad_added(GstElement *decodebin, GstPad *pad,
|
|
|
8dae9dd |
+ gpointer data)
|
|
|
8dae9dd |
{
|
|
|
8dae9dd |
GstCaps *caps;
|
|
|
8dae9dd |
GstStructure *str;
|
|
|
8dae9dd |
@@ -244,8 +244,8 @@ bbd_pipeline_construct (BansheeBpmDetector *detector)
|
|
|
8dae9dd |
}
|
|
|
8dae9dd |
|
|
|
8dae9dd |
// decodebin and audioconvert are linked dynamically when the decodebin creates a new pad
|
|
|
8dae9dd |
- g_signal_connect(detector->decodebin, "new-decoded-pad",
|
|
|
8dae9dd |
- G_CALLBACK(bbd_new_decoded_pad), detector);
|
|
|
8dae9dd |
+ g_signal_connect(detector->decodebin, "pad-added",
|
|
|
8dae9dd |
+ G_CALLBACK(bbd_pad_added), detector);
|
|
|
8dae9dd |
|
|
|
8dae9dd |
if (!gst_element_link_many (detector->audioconvert, detector->bpmdetect, detector->fakesink, NULL)) {
|
|
|
8dae9dd |
bbd_raise_error (detector, _("Could not link pipeline elements"), NULL);
|
|
|
8dae9dd |
diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c
|
|
|
8dae9dd |
index 0e241f0..f678838 100644
|
|
|
8dae9dd |
--- a/libbanshee/banshee-transcoder.c
|
|
|
8dae9dd |
+++ b/libbanshee/banshee-transcoder.c
|
|
|
8dae9dd |
@@ -185,8 +185,8 @@ gst_transcoder_build_encoder(const gchar *encoder_pipeline)
|
|
|
8dae9dd |
}
|
|
|
8dae9dd |
|
|
|
8dae9dd |
static void
|
|
|
8dae9dd |
-gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad,
|
|
|
8dae9dd |
- gboolean last, gpointer data)
|
|
|
8dae9dd |
+gst_transcoder_pad_added(GstElement *decodebin, GstPad *pad,
|
|
|
8dae9dd |
+ gpointer data)
|
|
|
8dae9dd |
{
|
|
|
8dae9dd |
GstCaps *caps;
|
|
|
8dae9dd |
GstStructure *str;
|
|
|
8dae9dd |
@@ -293,8 +293,8 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
|
|
|
8dae9dd |
|
|
|
8dae9dd |
gst_element_link(source_elem, decoder_elem);
|
|
|
8dae9dd |
|
|
|
8dae9dd |
- g_signal_connect(decoder_elem, "new-decoded-pad",
|
|
|
8dae9dd |
- G_CALLBACK(gst_transcoder_new_decoded_pad), transcoder);
|
|
|
8dae9dd |
+ g_signal_connect(decoder_elem, "pad-added",
|
|
|
8dae9dd |
+ G_CALLBACK(gst_transcoder_pad_added), transcoder);
|
|
|
8dae9dd |
|
|
|
8dae9dd |
gst_bus_add_watch(gst_pipeline_get_bus(GST_PIPELINE(transcoder->pipeline)),
|
|
|
8dae9dd |
gst_transcoder_bus_callback, transcoder);
|