[Pkg-cli-apps-commits] [banshee] 02/04: Refresh patches
Chow Loong Jin
hyperair at debian.org
Sat Feb 22 21:25:57 UTC 2014
This is an automated email from the git hooks/post-receive script.
hyperair pushed a commit to branch master
in repository banshee.
commit fde3242f9a3525de08b111d26e7c9441003365c8
Author: Chow Loong Jin <hyperair at debian.org>
Date: Sun Feb 23 00:10:11 2014 +0800
Refresh patches
---
debian/patches/Initial-port-to-GStreamer-1.0.patch | 6 ++---
...build-time-enable-gapless-playback-option.patch | 16 ++++++------
...orkManager-Cache-null-artwork-for-fast-lo.patch | 30 ++++++----------------
3 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/debian/patches/Initial-port-to-GStreamer-1.0.patch b/debian/patches/Initial-port-to-GStreamer-1.0.patch
index 7475bcb..e14c362 100644
--- a/debian/patches/Initial-port-to-GStreamer-1.0.patch
+++ b/debian/patches/Initial-port-to-GStreamer-1.0.patch
@@ -218,7 +218,7 @@ index 20804c4..30118c5 100644
if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) {
diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
-index ed845f3..6c2af35 100644
+index 4dae104..018bcd2 100644
--- a/libbanshee/banshee-player-pipeline.c
+++ b/libbanshee/banshee-player-pipeline.c
@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player)
@@ -290,7 +290,7 @@ index ed845f3..6c2af35 100644
});
}
bp_debug ("Audiosink has volume: %s",
-@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player)
+@@ -386,7 +385,7 @@ _bp_pipeline_construct (BansheePlayer *player)
}
// Ghost pad the audio bin so audio is passed from the bin into the tee
@@ -299,7 +299,7 @@ index ed845f3..6c2af35 100644
gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad));
gst_object_unref (teepad);
-@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player)
+@@ -414,8 +413,8 @@ _bp_pipeline_construct (BansheePlayer *player)
gst_bus_add_watch (bus, bp_pipeline_bus_callback, player);
// Link the first tee pad to the primary audio sink queue
diff --git a/debian/patches/Remove-build-time-enable-gapless-playback-option.patch b/debian/patches/Remove-build-time-enable-gapless-playback-option.patch
index c6d4f51..d111092 100644
--- a/debian/patches/Remove-build-time-enable-gapless-playback-option.patch
+++ b/debian/patches/Remove-build-time-enable-gapless-playback-option.patch
@@ -16,10 +16,10 @@ the conditionals.
7 files changed, 10 insertions(+), 63 deletions(-)
diff --git a/configure.ac b/configure.ac
-index f36063e..f698ccd 100644
+index e9c34b1..5e272ba 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -171,21 +171,6 @@ BANSHEE_CHECK_SOUNDMENU
+@@ -172,21 +172,6 @@ BANSHEE_CHECK_SOUNDMENU
dnl Ubuntu One Music Store (optional)
BANSHEE_CHECK_UBUNTUONE
@@ -57,7 +57,7 @@ index 6ed369a..a05c492 100644
bansheelib_LTLIBRARIES = libbanshee.la
diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
-index 6c2af35..d4977e1 100644
+index 018bcd2..28bae33 100644
--- a/libbanshee/banshee-player-pipeline.c
+++ b/libbanshee/banshee-player-pipeline.c
@@ -239,7 +239,6 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata)
@@ -111,10 +111,10 @@ index b8f98b8..08c4f94 100644
{
g_return_val_if_fail (IS_BANSHEE_PLAYER (player), FALSE);
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
-index 278ff51..05b1905 100644
+index 806093a..5181f2b 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
-@@ -747,16 +747,11 @@ namespace Banshee.GStreamer
+@@ -758,16 +758,11 @@ namespace Banshee.GStreamer
get { return gapless_enabled; }
set
{
@@ -135,7 +135,7 @@ index 278ff51..05b1905 100644
}
}
}
-@@ -881,13 +876,11 @@ namespace Banshee.GStreamer
+@@ -892,13 +887,11 @@ namespace Banshee.GStreamer
Catalog.GetString ("For tracks that have ReplayGain data, automatically scale (normalize) playback volume"),
delegate { ReplayGainEnabled = ReplayGainEnabledSchema.Get (); }
));
@@ -154,7 +154,7 @@ index 278ff51..05b1905 100644
}
private void UninstallPreferences ()
-@@ -898,9 +891,7 @@ namespace Banshee.GStreamer
+@@ -909,9 +902,7 @@ namespace Banshee.GStreamer
}
service["general"]["misc"].Remove (replaygain_preference);
@@ -165,7 +165,7 @@ index 278ff51..05b1905 100644
replaygain_preference = null;
gapless_preference = null;
}
-@@ -969,9 +960,6 @@ namespace Banshee.GStreamer
+@@ -980,9 +971,6 @@ namespace Banshee.GStreamer
BansheePlayerAboutToFinishCallback cb);
[DllImport ("libbanshee.dll")]
diff --git a/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch b/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
index d22eb05..89d49cc 100644
--- a/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
+++ b/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
@@ -4,14 +4,14 @@ Subject: Revert "[ArtworkManager] Cache null artwork for fast lookup"
This reverts commit 768c76da611a990054ff0921f24d566de86ac749.
---
- .../Banshee.Collection.Gui/ArtworkManager.cs | 15 ---------------
- 1 file changed, 15 deletions(-)
+ .../Banshee.Collection.Gui/ArtworkManager.cs | 10 ----------
+ 1 file changed, 10 deletions(-)
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
-index 6e1aa47..fe5f25e 100644
+index d3da931..1bee39d 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
-@@ -50,7 +50,6 @@ namespace Banshee.Collection.Gui
+@@ -49,7 +49,6 @@ namespace Banshee.Collection.Gui
{
private Dictionary<int, SurfaceCache> scale_caches = new Dictionary<int, SurfaceCache> ();
private HashSet<int> cacheable_cover_sizes = new HashSet<int> ();
@@ -19,21 +19,7 @@ index 6e1aa47..fe5f25e 100644
private class SurfaceCache : LruCache<string, Cairo.ImageSurface>
{
-@@ -122,13 +121,8 @@ namespace Banshee.Collection.Gui
- return surface;
- }
-
-- if (null_artwork_ids.Contains (id)) {
-- return null;
-- }
--
- Pixbuf pixbuf = LookupScalePixbuf (id, size);
- if (pixbuf == null || pixbuf.Handle == IntPtr.Zero) {
-- null_artwork_ids.Add (id);
- return null;
- }
-
-@@ -168,17 +162,12 @@ namespace Banshee.Collection.Gui
+@@ -170,17 +169,12 @@ namespace Banshee.Collection.Gui
return null;
}
@@ -51,7 +37,7 @@ index 6e1aa47..fe5f25e 100644
return null;
}
}
-@@ -195,7 +184,6 @@ namespace Banshee.Collection.Gui
+@@ -197,7 +191,6 @@ namespace Banshee.Collection.Gui
Pixbuf pixbuf = new Pixbuf (unconverted_path);
if (pixbuf.Width < 50 || pixbuf.Height < 50) {
Hyena.Log.DebugFormat ("Ignoring cover art {0} because less than 50x50", unconverted_path);
@@ -59,7 +45,7 @@ index 6e1aa47..fe5f25e 100644
return null;
}
-@@ -236,7 +224,6 @@ namespace Banshee.Collection.Gui
+@@ -241,7 +234,6 @@ namespace Banshee.Collection.Gui
} catch {}
}
@@ -67,7 +53,7 @@ index 6e1aa47..fe5f25e 100644
return null;
}
-@@ -256,8 +243,6 @@ namespace Banshee.Collection.Gui
+@@ -261,8 +253,6 @@ namespace Banshee.Collection.Gui
scale_caches[size].Remove (id);
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git
More information about the Pkg-cli-apps-commits
mailing list