[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/natty, updated. debian/1.9.0+git20101121.r1.b13266e-0ubuntu1-1-ge4abeed

[Chow Loong Jin]

The following commit has been merged in the ubuntu/natty branch:
commit e4abeed84a44fb6da39835e3a7f639a124e7e459
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Mon Nov 22 05:12:40 2010 +0800

    Revert performance patch that caused artwork to not display
    
    * debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch:
      + Revert a recent performance related patch that caused artwork to not
        display at all

diff --git a/debian/changelog b/debian/changelog
index d87ca93..6faf6ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+banshee (1.9.0+git20101121.r1.b13266e-0ubuntu2) natty; urgency=low
+
+  * debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch:
+    + Revert a recent performance related patch that caused artwork to not
+      display at all
+
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 22 Nov 2010 05:11:45 +0800
+
 banshee (1.9.0+git20101121.r1.b13266e-0ubuntu1) natty; urgency=low
 
   * New upstream snapshot: Drop binary dep on libmono-system-data*-cil
diff --git a/debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch b/debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
new file mode 100644
index 0000000..c73efab
--- /dev/null
+++ b/debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
@@ -0,0 +1,82 @@
+From 38beaaccc53077199f4416ed62f4a0746297b602 Mon Sep 17 00:00:00 2001
+From: Chow Loong Jin <hyperair at ubuntu.com>
+Date: Mon, 22 Nov 2010 04:36:40 +0800
+Subject: [PATCH] Revert "[ArtworkManager] Cache null artwork for fast lookup"
+
+This reverts commit 768c76da611a990054ff0921f24d566de86ac749.
+---
+ .../Banshee.Collection.Gui/ArtworkManager.cs       |   15 ---------------
+ 1 files changed, 0 insertions(+), 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 cba8ec8..2414ca1 100644
+--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
++++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
+@@ -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> ();
+-        private HashSet<string> null_artwork_ids = new HashSet<string> ();
+ 
+         private class SurfaceCache : LruCache<string, Cairo.ImageSurface>
+         {
+@@ -117,13 +116,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;
+             }
+ 
+@@ -163,17 +157,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;
+                 }
+             }
+@@ -190,7 +179,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;
+                         }
+ 
+@@ -231,7 +219,6 @@ namespace Banshee.Collection.Gui
+                 } catch {}
+             }
+ 
+-            null_artwork_ids.Add (id);
+             return null;
+         }
+ 
+@@ -251,8 +238,6 @@ namespace Banshee.Collection.Gui
+                 scale_caches[size].Remove (id);
+             }
+ 
+-            null_artwork_ids.Remove (id);
+-
+             if (inMemoryCacheOnly) {
+                 return;
+             }
+-- 
+1.7.1
+
diff --git a/debian/patches/series b/debian/patches/series
index ef00b81..de43c22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,5 @@
 07_enable-library-watch-by-default.patch
 08_remove_unrelevant_media.patch
 0001-Don-t-copy-duplicate-libraries.patch
+0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
 99_ltmain_as-needed.patch

-- 
banshee