cowbell r44 - in trunk: . base/services gui gui/services

[btaylor svn gnome org]

Author: btaylor
Date: Wed Jun 11 04:38:30 2008
New Revision: 44
URL: http://svn.gnome.org/viewvc/cowbell?rev=44&view=rev

Log:
2008-06-10  Brad Taylor  <brad getcoded net>
	
	* gui/MainWindow.cs: Move art-checking code into GlobalDataModified.

	* gui/AlbumCoverImage.cs:
	* base/services/IAlbumArtworkCacheService.cs:
	* gui/services/AlbumArtworkCacheService.cs: Move filesystem art
	  checking code into AlbumArtworkCacheService.



Modified:
   trunk/ChangeLog
   trunk/base/services/IAlbumArtworkCacheService.cs
   trunk/gui/AlbumCoverImage.cs
   trunk/gui/MainWindow.cs
   trunk/gui/services/AlbumArtworkCacheService.cs

Modified: trunk/base/services/IAlbumArtworkCacheService.cs
==============================================================================
--- trunk/base/services/IAlbumArtworkCacheService.cs	(original)
+++ trunk/base/services/IAlbumArtworkCacheService.cs	Wed Jun 11 04:38:30 2008
@@ -30,6 +30,8 @@
 		event ArtworkChangedHandler ArtworkChanged;
 
 		void SaveCurrentArtwork (string filename, string type);
+
+		void CheckFilesystemForAlbumArt (string path);
 	}
 
 	public class ArtworkChangedArgs : EventArgs

Modified: trunk/gui/AlbumCoverImage.cs
==============================================================================
--- trunk/gui/AlbumCoverImage.cs	(original)
+++ trunk/gui/AlbumCoverImage.cs	Wed Jun 11 04:38:30 2008
@@ -62,23 +62,6 @@
 			Add (image);
 			image.Show ();
 		}
-
-		public bool CheckFilesystemForAlbumArt (string path)
-		{
-			foreach (string file in CoverFilenames)
-			{
-				FileInfo cover = new FileInfo (System.IO.Path.Combine (path, file));
-				
-				if (cover.Exists) {
-					Pixbuf buf = BeautifyPixbuf (new Pixbuf (cover.ToString ()));					
-					if (buf != null) {
-						art_cache_svc.CacheArtwork (buf);
-						return true;
-					}
-				}	
-			}
-			return false;
-		}
 #endregion
 
 #region private fields
@@ -93,15 +76,6 @@
 			new TargetEntry ("_NETSCAPE_URL", 0, (uint)TargetType.Uri)
 		};
 
-		private static string[] CoverFilenames = {
-			"cover.jpg", "Cover.jpg", "cover.jpeg",
-			"Cover.jpeg", "cover.png", "Cover.png",
-			"cover.gif", "Cover.gif", "cover.bmp",
-			"Cover.bmp", "folder.jpg", "Folder.jpg",
-			"folder.jpeg", "Folder.jpeg", ".folder.png",
-			"folder.png", "Folder.png"
-		};
-
 		private enum TargetType {
 			UriList,
 			Uri

Modified: trunk/gui/MainWindow.cs
==============================================================================
--- trunk/gui/MainWindow.cs	(original)
+++ trunk/gui/MainWindow.cs	Wed Jun 11 04:38:30 2008
@@ -138,7 +138,6 @@
 
 		/* private fields */
 		[Glade.Widget] Window window;
-		[Glade.Widget] AlbumCoverImage cover;
 		[Glade.Widget] MenuItem open, save, revert, quit, guess_song_information, preferences, clear_list, about;
 		[Glade.Widget] ToggleButton MultipleArtistCheckBox, MultipleDiscCheckBox;
 		[Glade.Widget] Entry ArtistEntry, AlbumEntry, YearEntry;
@@ -219,9 +218,6 @@
 			TracksLabel.Text = String.Format (Catalog.GetString ("Tracks: {0}"),
 			                                  Runtime.Database.Count);
 
-			// check for new album art
-			cover.CheckFilesystemForAlbumArt (Runtime.Filesystem.GetBasedir ());
-
 			// XXX: Hack around a stupid gtk bug
 			MainHPaned.QueueDraw ();
 		}
@@ -252,6 +248,12 @@
 
 			ArtistEntry.Sensitive = !Runtime.Database.MultipleArtists;
 			AlbumEntry.Sensitive = !Runtime.Database.MultipleDiscs;
+
+			// check for new album art
+			IAlbumArtworkCacheService art_cache_svc
+				= (IAlbumArtworkCacheService)ServiceManager.GetService (
+					typeof (IAlbumArtworkCacheService));
+			art_cache_svc.CheckFilesystemForAlbumArt (Runtime.Filesystem.GetBasedir ());
 		}
 
 		private void OnFileQuitActivate (object o, EventArgs args)

Modified: trunk/gui/services/AlbumArtworkCacheService.cs
==============================================================================
--- trunk/gui/services/AlbumArtworkCacheService.cs	(original)
+++ trunk/gui/services/AlbumArtworkCacheService.cs	Wed Jun 11 04:38:30 2008
@@ -21,6 +21,7 @@
 
 using Gdk;
 using System;
+using System.IO;
 using System.Reflection;
 using System.Collections;
 using System.Collections.Generic;
@@ -68,6 +69,18 @@
 			artwork["0"] = null;
 		}
 
+
+		public void CheckFilesystemForAlbumArt (string path)
+		{
+			foreach (string file in CoverFilenames)
+			{
+				FileInfo cover = new FileInfo (System.IO.Path.Combine (path, file));
+				if (cover.Exists) {
+					CacheArtwork (new Pixbuf (cover.ToString ()));
+				}	
+			}
+		}
+
 		public void CacheArtwork (Gdk.Pixbuf data)
 		{
 			artwork[CurrentStamp] = data;
@@ -107,6 +120,15 @@
 #endregion
 
 #region private fields
+		private static string[] CoverFilenames = {
+			"cover.jpg", "Cover.jpg", "cover.jpeg",
+			"Cover.jpeg", "cover.png", "Cover.png",
+			"cover.gif", "Cover.gif", "cover.bmp",
+			"Cover.bmp", "folder.jpg", "Folder.jpg",
+			"folder.jpeg", "Folder.jpeg", ".folder.png",
+			"folder.png", "Folder.png"
+		};
+
 		private IDatabaseService db_svc;
 		private IDispatchService dispatch_svc;