← Back to branch summary

~ubuntu-branches/ubuntu/trusty/banshee/trusty

« back to all changes in this revision

Viewing changes to debian/patches/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2013-06-05 21:05:42 UTC
  • mfrom: (6.4.27 sid)
  • Revision ID: package-import@ubuntu.com-20130605210542-mpm73q57pyx928ml
Tags: 2.6.1-2ubuntu1
* [cce9151] Merge from unstable, remaining changes:
  - Enable and recommend SoundMenu and Disable NotificationArea by default
  - Disable boo and karma extensions
  - Move desktop file for Meego UI to /usr/share/une/applications
  - Change the url for the Amazon store redirector
  - [9b356d6] Add workaround for set_Height exception.
  - [ccbcbbd] Make Banshee translatable in Launchpad
  - [2094ee5] Bump libgpod build-dep version to 0.8.2-7~
  - [03c8cad] Set debian-branch to ubuntu/raring

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch
 
1
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
 
2
Date: Tue, 28 May 2013 11:36:04 +0200
 
3
Subject: Don't use the new-decoded-pad signal of decodebin
 
4
 
 
5
It is not available anymore in 1.0 and pad-added should be used.
 
6
---
 
7
 libbanshee/banshee-bpmdetector.c | 8 ++++----
 
8
 libbanshee/banshee-transcoder.c  | 8 ++++----
 
9
 2 files changed, 8 insertions(+), 8 deletions(-)
 
10
 
 
11
diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c
 
12
index 68b0419..131d2e5 100644
 
13
--- a/libbanshee/banshee-bpmdetector.c
 
14
+++ b/libbanshee/banshee-bpmdetector.c
 
15
@@ -159,8 +159,8 @@ bbd_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer data)
 
16
 }
 
17
 
 
18
 static void
 
19
-bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad, 
 
20
-    gboolean last, gpointer data)
 
21
+bbd_pad_added(GstElement *decodebin, GstPad *pad, 
 
22
+    gpointer data)
 
23
 {
 
24
     GstCaps *caps;
 
25
     GstStructure *str;
 
26
@@ -244,8 +244,8 @@ bbd_pipeline_construct (BansheeBpmDetector *detector)
 
27
     }
 
28
 
 
29
     // decodebin and audioconvert are linked dynamically when the decodebin creates a new pad
 
30
-    g_signal_connect(detector->decodebin, "new-decoded-pad", 
 
31
-        G_CALLBACK(bbd_new_decoded_pad), detector);
 
32
+    g_signal_connect(detector->decodebin, "pad-added", 
 
33
+        G_CALLBACK(bbd_pad_added), detector);
 
34
 
 
35
     if (!gst_element_link_many (detector->audioconvert, detector->bpmdetect, detector->fakesink, NULL)) {
 
36
         bbd_raise_error (detector, _("Could not link pipeline elements"), NULL);
 
37
diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c
 
38
index 0e241f0..f678838 100644
 
39
--- a/libbanshee/banshee-transcoder.c
 
40
+++ b/libbanshee/banshee-transcoder.c
 
41
@@ -185,8 +185,8 @@ gst_transcoder_build_encoder(const gchar *encoder_pipeline)
 
42
 }    
 
43
 
 
44
 static void
 
45
-gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad, 
 
46
-    gboolean last, gpointer data)
 
47
+gst_transcoder_pad_added(GstElement *decodebin, GstPad *pad, 
 
48
+    gpointer data)
 
49
 {
 
50
     GstCaps *caps;
 
51
     GstStructure *str;
 
52
@@ -293,8 +293,8 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
 
53
         
 
54
     gst_element_link(source_elem, decoder_elem);
 
55
 
 
56
-    g_signal_connect(decoder_elem, "new-decoded-pad", 
 
57
-        G_CALLBACK(gst_transcoder_new_decoded_pad), transcoder);
 
58
+    g_signal_connect(decoder_elem, "pad-added", 
 
59
+        G_CALLBACK(gst_transcoder_pad_added), transcoder);
 
60
 
 
61
     gst_bus_add_watch(gst_pipeline_get_bus(GST_PIPELINE(transcoder->pipeline)), 
 
62
         gst_transcoder_bus_callback, transcoder);