banshee r3541 - in trunk/banshee: . src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying src/Libraries/Hyena/Hyena.Data src/Libraries/Hyena/Hyena.Data.Sqlite

[gburt svn gnome org]

Author: gburt
Date: Tue Mar 25 21:59:31 2008
New Revision: 3541
URL: http://svn.gnome.org/viewvc/banshee?rev=3541&view=rev

Log:
2008-03-25  Gabriel Burt  <gabriel burt gmail com>

	* src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:
	Change icon to application-multimedia.  Not perfect, but at least not
	confusing with the play button.

	* src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs: Override
	clear, calling base and resetting the first_order_id, fixing bug in
	IndexOf that was causing playback issues with smart playlists.

	* src/Libraries/Hyena/Hyena.Data/ArrayModelCache.cs:
	* src/Libraries/Hyena/Hyena.Data/DictionaryModelCache.cs:  Remove lock
	around Clear method since now done in subclass.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
   trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs
   trunk/banshee/src/Libraries/Hyena/Hyena.Data/ArrayModelCache.cs
   trunk/banshee/src/Libraries/Hyena/Hyena.Data/DictionaryModelCache.cs

Modified: trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs	Tue Mar 25 21:59:31 2008
@@ -45,7 +45,7 @@
         
         public NowPlayingSource () : base ("now-playing", Catalog.GetString ("Now Playing"), 0)
         {
-            Properties.SetString ("Icon.Name", "media-playback-start");
+            Properties.SetString ("Icon.Name", "applications-multimedia");
             Properties.Set<ISourceContents> ("Nereid.SourceContents", new NowPlayingInterface ());
             Properties.Set<bool> ("Nereid.SourceContents.HeaderVisible", false);
             

Modified: trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena.Data.Sqlite/SqliteModelCache.cs	Tue Mar 25 21:59:31 2008
@@ -253,6 +253,13 @@
                 Clear ();
                 //Log.DebugFormat ("Reloading {0} with {1}", model, last_reload_command.Text);
                 connection.Execute (last_reload_command);
+            }
+        }
+
+        public override void Clear ()
+        {
+            lock (this) {
+                base.Clear ();
                 first_order_id = -1;
             }
         }

Modified: trunk/banshee/src/Libraries/Hyena/Hyena.Data/ArrayModelCache.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena.Data/ArrayModelCache.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena.Data/ArrayModelCache.cs	Tue Mar 25 21:59:31 2008
@@ -69,10 +69,8 @@
 
         public override void Clear ()
         {
-            lock (this) {
-                offset = -1;
-                limit = 0;
-            }
+            offset = -1;
+            limit = 0;
         }
     }
 }

Modified: trunk/banshee/src/Libraries/Hyena/Hyena.Data/DictionaryModelCache.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena.Data/DictionaryModelCache.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena.Data/DictionaryModelCache.cs	Tue Mar 25 21:59:31 2008
@@ -56,9 +56,7 @@
 
         public override void Clear ()
         {
-            lock (this) {
-                cache.Clear ();
-            }
+            cache.Clear ();
         }
     }
 }