[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/2.3.1-1-7-gcad88fc

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit edcf4986c8f3cb30e1672ca00a7364f32548b916
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Dec 1 10:19:21 2011 +0800

    Drop upstreamed patches

diff --git a/debian/patches/0001-libbanshee-Remove-unused-wanted_size-variable.patch b/debian/patches/0001-libbanshee-Remove-unused-wanted_size-variable.patch
deleted file mode 100644
index 91abfe2..0000000
--- a/debian/patches/0001-libbanshee-Remove-unused-wanted_size-variable.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9bbc58138d124177537326db53f1b0ca2106bdc6 Mon Sep 17 00:00:00 2001
-From: Chow Loong Jin <hyperair at ubuntu.com>
-Date: Thu, 3 Nov 2011 09:12:04 +0800
-Subject: [PATCH] libbanshee: Remove unused wanted_size variable
-
-This fixes the following warning (bgo#663281):
-banshee-player-vis.c: In function '_bp_vis_pipeline_setup':
-banshee-player-vis.c:206:10: error: variable 'wanted_size' set but not used
-[-Werror=unused-but-set-variable]
----
- libbanshee/banshee-player-vis.c |    6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
-
-diff --git a/libbanshee/banshee-player-vis.c b/libbanshee/banshee-player-vis.c
-index 18c71c7..5787c87 100644
---- a/libbanshee/banshee-player-vis.c
-+++ b/libbanshee/banshee-player-vis.c
-@@ -203,8 +203,7 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-     GstCaps *caps;
-     GstPad *teepad;
-     GstPad *pad;
--    gint wanted_size;
--    
-+
-     player->vis_buffer = NULL;
-     player->vis_fft = gst_fft_f32_new (SLICE_SIZE * 2, FALSE);
-     player->vis_fft_buffer = g_new (GstFFTF32Complex, SLICE_SIZE + 1);
-@@ -221,9 +220,6 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-     converter = gst_element_factory_make ("audioconvert", "vis-convert");
-     fakesink = gst_element_factory_make ("fakesink", "vis-sink");
- 
--    // channels * slice size * float size = size of chunks we want
--    wanted_size = 2 * SLICE_SIZE * sizeof(gfloat);
--
-     if (audiosinkqueue == NULL || resampler == NULL || converter == NULL || fakesink == NULL) {
-         bp_debug ("Could not construct visualization pipeline, a fundamental element could not be created");
-         return;
--- 
-1.7.5.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 06400c1..ff52a57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,5 +9,4 @@
 workaround-clideps-winmm.patch
 workaround-clideps-meego.patch
 fix-libgpod-wrong-cast-ftbfs.patch
-0001-libbanshee-Remove-unused-wanted_size-variable.patch
 99_ltmain_as-needed.patch

-- 
banshee