banshee r3071 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Collection.Database src/Core/Banshee.Services/Banshee.Sources src/Core/Hyena/Hyena.Data

[gburt svn gnome org]

Author: gburt
Date: Mon Jan 28 22:23:23 2008
New Revision: 3071
URL: http://svn.gnome.org/viewvc/banshee?rev=3071&view=rev

Log:
2008-01-28  Gabriel Burt  <gabriel burt gmail com>

	* src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs:
	* src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:
	* src/Core/Hyena/Hyena.Data/IFilterable.cs: Keep the meaning of Count
	consistent as the unfiltered count;  remove UnfilteredCount property, add
	FilteredCount property to IFilterable.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs
   trunk/banshee/src/Core/Hyena/Hyena.Data/IFilterable.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs	Mon Jan 28 22:23:23 2008
@@ -48,8 +48,8 @@
         private BansheeDbConnection connection;
         private BansheeModelProvider<LibraryTrackInfo> provider;
         private BansheeModelCache<LibraryTrackInfo> cache;
+        private int filtered_count;
         private int count;
-        private int unfiltered_count;
         
         private ISortableColumn sort_column;
         private string sort_query;
@@ -207,8 +207,8 @@
         public override void Clear()
         {
             cache.Clear ();
-            unfiltered_count = 0;
             count = 0;
+            filtered_count = 0;
             OnCleared();
         }
         
@@ -220,7 +220,7 @@
                 provider.From, JoinFragment, provider.Where, ConditionFragment
             );
 
-            unfiltered_count = connection.QueryInt32 (String.Format (
+            count = connection.QueryInt32 (String.Format (
                 "SELECT COUNT(*) {0}", unfiltered_query
             ));
 
@@ -254,7 +254,7 @@
                 cache.Reload ();
             }
 
-            count = cache.Count;
+            filtered_count = cache.Count;
             first_reload = false;
 
             OnReloaded ();
@@ -274,8 +274,8 @@
             get { return count; }
         }
         
-        public int UnfilteredCount {
-            get { return unfiltered_count; }
+        public int FilteredCount {
+            get { return filtered_count; }
         }
         
         public string Filter {

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs	Mon Jan 28 22:23:23 2008
@@ -64,7 +64,7 @@
 #region Public Properties
 
         public override int Count {
-            get { return track_model is IFilterable ? ((IFilterable)track_model).UnfilteredCount : track_model.Count; }
+            get { return track_model.Count; }
         }
 
         public override string FilterQuery {

Modified: trunk/banshee/src/Core/Hyena/Hyena.Data/IFilterable.cs
==============================================================================
--- trunk/banshee/src/Core/Hyena/Hyena.Data/IFilterable.cs	(original)
+++ trunk/banshee/src/Core/Hyena/Hyena.Data/IFilterable.cs	Mon Jan 28 22:23:23 2008
@@ -32,6 +32,6 @@
     {
         void Refilter();
         string Filter { get; set; }
-        int UnfilteredCount { get; }
+        int FilteredCount { get; }
     }
 }