[Pkg-cli-apps-commits] [banshee] 06/13: Drop Revert-ArtworkManager-....patch

[Chow Loong Jin]

This is an automated email from the git hooks/post-receive script.

hyperair pushed a commit to branch experimental
in repository banshee.

commit b862e785a3c8d28c462b1b244bf17010deb5ab6d
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon Oct 21 22:08:08 2013 +0800

    Drop Revert-ArtworkManager-....patch
---
 ...orkManager-Cache-null-artwork-for-fast-lo.patch | 78 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 79 deletions(-)

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
deleted file mode 100644
index d22eb05..0000000
--- a/debian/patches/Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From: Chow Loong Jin <hyperair at ubuntu.com>
-Date: Mon, 22 Nov 2010 04:36:40 +0800
-Subject: Revert "[ArtworkManager] Cache null artwork for fast lookup"
-
-This reverts commit 768c76da611a990054ff0921f24d566de86ac749.
----
- .../Banshee.Collection.Gui/ArtworkManager.cs              | 15 ---------------
- 1 file changed, 15 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
---- 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
-     {
-         private Dictionary<int, SurfaceCache> scale_caches  = new Dictionary<int, SurfaceCache> ();
-         private HashSet<int> cacheable_cover_sizes = new HashSet<int> ();
--        private HashSet<string> null_artwork_ids = new HashSet<string> ();
- 
-         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
-                 return null;
-             }
- 
--            if (null_artwork_ids.Contains (id)) {
--                return null;
--            }
--
-             // Find the scaled, cached file
-             string path = CoverArtSpec.GetPathForSize (id, size);
-             if (File.Exists (new SafeUri (path))) {
-                 try {
-                     return new Pixbuf (path);
-                 } catch {
--                    null_artwork_ids.Add (id);
-                     return null;
-                 }
-             }
-@@ -195,7 +184,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);
--                            null_artwork_ids.Add (id);
-                             return null;
-                         }
- 
-@@ -236,7 +224,6 @@ namespace Banshee.Collection.Gui
-                 } catch {}
-             }
- 
--            null_artwork_ids.Add (id);
-             return null;
-         }
- 
-@@ -256,8 +243,6 @@ namespace Banshee.Collection.Gui
-                 scale_caches[size].Remove (id);
-             }
- 
--            null_artwork_ids.Remove (id);
--
-             if (inMemoryCacheOnly) {
-                 return;
-             }
diff --git a/debian/patches/series b/debian/patches/series
index 1bb2661..e8011b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ Enable-switching-between-the-2-interfaces.patch
 Add-Meego-desktop-file.patch
 Enable-MPRIS-extension-by-default.patch
 Remove-irrelevant-media.patch
-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
 libossifer-Fix-certificate-validation-with-libsoup-2.patch
 Add-dllmaps-for-Banshee.NowPlaying.X11.dll.patch
 Initial-port-to-GStreamer-1.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git