[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, master, updated. upstream/1.5.4-23-gc6631f3

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 5f9ff1626c2a3e6d707c27589661c60ed46f98f7
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sat Mar 13 03:05:01 2010 +0800

    Drop 01_random-by-similar.patch, applied upstream

diff --git a/debian/patches/01_random-by-similar.patch b/debian/patches/01_random-by-similar.patch
deleted file mode 100644
index 6f04b13..0000000
--- a/debian/patches/01_random-by-similar.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit 5bdefae63d8613d6969ab681a3839813c8d759e8
-Author: Alexander Kojevnikov <alexander at kojevnikov.com>
-Date:   Fri Feb 26 11:10:18 2010 +1100
-
-    [Mirage.RandomBySimilar] Fix an exception (bgo#611066)
-
-diff --git a/src/Mirage/Banshee.Mirage/RandomBySimilar.cs b/src/Mirage/Banshee.Mirage/RandomBySimilar.cs
-index 16d58e4..58e991b 100644
---- a/src/Mirage/Banshee.Mirage/RandomBySimilar.cs
-+++ b/src/Mirage/Banshee.Mirage/RandomBySimilar.cs
-@@ -80,7 +80,12 @@ namespace Banshee.Mirage
- 
-         public override TrackInfo GetPlaybackTrack (DateTime after)
-         {
--            using (var seed = GetSeed ()) {
-+            var seed = GetSeed ();
-+            if (seed == null) {
-+                return null;
-+            }
-+
-+            using (seed) {
-                 var track = Cache.GetSingle (Select, From, cache_condition, seed.Id, after, after) as DatabaseTrackInfo;
-                 if (track != null) {
-                     last_track_id = track.TrackId;
-@@ -91,7 +96,12 @@ namespace Banshee.Mirage
- 
-         public override DatabaseTrackInfo GetShufflerTrack (DateTime after)
-         {
--            using (var seed = GetSeed ()) {
-+            var seed = GetSeed ();
-+            if (seed == null) {
-+                return null;
-+            }
-+
-+            using (seed) {
-                 var track = GetTrack (ShufflerQuery, seed.Id, after) as DatabaseTrackInfo;
-                 if (track != null) {
-                     last_track_id = track.TrackId;
-@@ -102,12 +112,13 @@ namespace Banshee.Mirage
- 
-         private BaseSeed GetSeed ()
-         {
--            return new SingleSeed (Scms.FromBytes (ServiceManager.DbConnection.Query<byte[]> (String.Format (
-+            var buf = ServiceManager.DbConnection.Query<byte[]> (String.Format (
-                 "SELECT ScmsData FROM MirageTrackAnalysis WHERE Status = 0 {0} LIMIT 1",
-                 last_track_id == 0
-                     ? "ORDER BY RANDOM ()"
-                     : String.Format ("AND TrackID = {0}", last_track_id)
--            ))));
-+            ));
-+            return buf == null ? null : new SingleSeed (Scms.FromBytes (buf));
-         }
-     }
- }
diff --git a/debian/patches/series b/debian/patches/series
index 65c0a97..3721306 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_random-by-similar.patch
 99_ignore-quilt.patch

-- 
banshee-community-extensions