[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/raring, updated. debian/2.6.1-1ubuntu1-2-g64ec257

[Chow Loong Jin]

The following commit has been merged in the ubuntu/raring branch:
commit 6fe397125896fe2bc195f045618ab311d3e1776a
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Jun 16 16:32:32 2013 +0800

    Cherry-pick fix for transcoding exceptions
    
    LP: #1159513

diff --git a/debian/patches/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch b/debian/patches/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch
new file mode 100644
index 0000000..3a012c9
--- /dev/null
+++ b/debian/patches/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch
@@ -0,0 +1,62 @@
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo at circular-chaos.org>
+Date: Tue, 28 May 2013 11:36:04 +0200
+Subject: Don't use the new-decoded-pad signal of decodebin
+
+It is not available anymore in 1.0 and pad-added should be used.
+---
+ libbanshee/banshee-bpmdetector.c | 8 ++++----
+ libbanshee/banshee-transcoder.c  | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c
+index 68b0419..131d2e5 100644
+--- a/libbanshee/banshee-bpmdetector.c
++++ b/libbanshee/banshee-bpmdetector.c
+@@ -159,8 +159,8 @@ bbd_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer data)
+ }
+ 
+ static void
+-bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad, 
+-    gboolean last, gpointer data)
++bbd_pad_added(GstElement *decodebin, GstPad *pad, 
++    gpointer data)
+ {
+     GstCaps *caps;
+     GstStructure *str;
+@@ -244,8 +244,8 @@ bbd_pipeline_construct (BansheeBpmDetector *detector)
+     }
+ 
+     // decodebin and audioconvert are linked dynamically when the decodebin creates a new pad
+-    g_signal_connect(detector->decodebin, "new-decoded-pad", 
+-        G_CALLBACK(bbd_new_decoded_pad), detector);
++    g_signal_connect(detector->decodebin, "pad-added", 
++        G_CALLBACK(bbd_pad_added), detector);
+ 
+     if (!gst_element_link_many (detector->audioconvert, detector->bpmdetect, detector->fakesink, NULL)) {
+         bbd_raise_error (detector, _("Could not link pipeline elements"), NULL);
+diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c
+index 0e241f0..f678838 100644
+--- a/libbanshee/banshee-transcoder.c
++++ b/libbanshee/banshee-transcoder.c
+@@ -185,8 +185,8 @@ gst_transcoder_build_encoder(const gchar *encoder_pipeline)
+ }    
+ 
+ static void
+-gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad, 
+-    gboolean last, gpointer data)
++gst_transcoder_pad_added(GstElement *decodebin, GstPad *pad, 
++    gpointer data)
+ {
+     GstCaps *caps;
+     GstStructure *str;
+@@ -293,8 +293,8 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
+         
+     gst_element_link(source_elem, decoder_elem);
+ 
+-    g_signal_connect(decoder_elem, "new-decoded-pad", 
+-        G_CALLBACK(gst_transcoder_new_decoded_pad), transcoder);
++    g_signal_connect(decoder_elem, "pad-added", 
++        G_CALLBACK(gst_transcoder_pad_added), transcoder);
+ 
+     gst_bus_add_watch(gst_pipeline_get_bus(GST_PIPELINE(transcoder->pipeline)), 
+         gst_transcoder_bus_callback, transcoder);
diff --git a/debian/patches/series b/debian/patches/series
index 05b80f3..429e001 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,7 @@ libossifer-Fix-certificate-validation-with-libsoup-2.patch
 Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
 Initial-port-to-GStreamer-1.0.patch
 Remove-build-time-enable-gapless-playback-option.patch
+Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch
 Disable-Notification-area-extension-by-default.patch
 Enable-sound-menu-extension-by-default.patch
 Change-Amazon-redirect-url.patch

-- 
banshee