[maemo-commits] [maemo-commits] r16389 - in projects/haf/trunk/hildon-thumbnail: . daemon tests thumbs

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Tue Oct 14 13:49:25 EEST 2008 
Author: pvanhoof
Date: 2008-10-14 13:49:23 +0300 (Tue, 14 Oct 2008)
New Revision: 16389

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/albumart.c
   projects/haf/trunk/hildon-thumbnail/tests/artist-art-test.c
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.c
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.h
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-obj.c
Log:
2008-10-14  Philip Van Hoof  <philip at codeminded.be>

	* tests/artist-art-test.c
	* thumbs/hildon-albumart-factory.c
	* thumbs/hildon-albumart-obj.c
	* thumbs/hildon-albumart-factory.h
	* daemon/albumart.c: Bugfixes and added support for the new mediaart
	storage spec in the client library for albumart downloading



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-10-14 10:36:17 UTC (rev 16388)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-10-14 10:49:23 UTC (rev 16389)
@@ -1,5 +1,14 @@
 2008-10-14  Philip Van Hoof  <philip at codeminded.be>
 
+	* tests/artist-art-test.c
+	* thumbs/hildon-albumart-factory.c
+	* thumbs/hildon-albumart-obj.c
+	* thumbs/hildon-albumart-factory.h
+	* daemon/albumart.c: Bugfixes and added support for the new mediaart
+	storage spec in the client library for albumart downloading
+
+2008-10-14  Philip Van Hoof  <philip at codeminded.be>
+
 	* albumart-providers/googleimages/google-images-art-downloader.vala
 	* daemon/utils.c
 	* daemon/utils.h

Modified: projects/haf/trunk/hildon-thumbnail/daemon/albumart.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/albumart.c	2008-10-14 10:36:17 UTC (rev 16388)
+++ projects/haf/trunk/hildon-thumbnail/daemon/albumart.c	2008-10-14 10:49:23 UTC (rev 16389)
@@ -118,7 +118,7 @@
 	WorkTask *task;
 	static guint num = 0;
 
-	if (!kind)
+	if (!kind || strlen (album) == 0)
 		kind = "album";
 
 	if (artist_or_title && strlen (artist_or_title) <= 0)

Modified: projects/haf/trunk/hildon-thumbnail/tests/artist-art-test.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/tests/artist-art-test.c	2008-10-14 10:36:17 UTC (rev 16388)
+++ projects/haf/trunk/hildon-thumbnail/tests/artist-art-test.c	2008-10-14 10:49:23 UTC (rev 16389)
@@ -26,7 +26,7 @@
 	album = gtk_entry_get_text (btext);
 	artist = gtk_entry_get_text (atext);
 
-	hildon_albumart_factory_load(artist, album, NULL, on_art_back, NULL);
+	hildon_albumart_factory_load(artist, album, "album", on_art_back, NULL);
 }
 
 int

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.c	2008-10-14 10:36:17 UTC (rev 16388)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.c	2008-10-14 10:49:23 UTC (rev 16389)
@@ -47,7 +47,7 @@
 
 
 typedef struct {
-	gchar *uri, *album, *artist;
+	gchar *kind, *album, *artist;
 	HildonAlbumartFactoryFinishedCallback callback;
 	gpointer user_data;
 	gboolean canceled;
@@ -90,7 +90,7 @@
 
 static void thumb_item_free(ArtsItem* item)
 {
-	g_free(item->uri);
+	g_free(item->kind);
 	g_free(item->artist);
 	g_free(item->album);
 	g_free(item);
@@ -153,7 +153,7 @@
 
 		hildon_thumbnail_util_get_albumart_path (item->artist, 
 												 item->album, 
-												 item->uri, &path);
+												 item->kind, &path);
 
 		create_pixbuf_and_callback (item, path);
 
@@ -317,25 +317,26 @@
 }
 
 HildonAlbumartFactoryHandle hildon_albumart_factory_load(
-				const gchar *artist,
+				const gchar *artist_or_title,
 				const gchar *album,
-				const gchar *uri,
+				const gchar *kind,
 				HildonAlbumartFactoryFinishedCallback callback,
 				gpointer user_data)
 {
+	const gchar *artist = artist_or_title;
 	gchar *path;
 	GError *error = NULL;
 	ArtsItem *item;
 	gboolean have_all = FALSE;
 
-	hildon_thumbnail_util_get_albumart_path (artist, album, uri, &path);
+	hildon_thumbnail_util_get_albumart_path (artist, album, kind, &path);
 
 	have_all = g_file_test (path, G_FILE_TEST_EXISTS);
 
 	item = g_new0 (ArtsItem, 1);
 
-	if (uri)
-		item->uri = g_strdup(uri);
+	if (kind)
+		item->kind = g_strdup(kind);
 	if (album)
 		item->album = g_strdup(album);
 	if (artist)
@@ -365,7 +366,7 @@
 
 		com_nokia_albumart_Requester_queue_async (proxy, artist, 
 												  album, 
-												  uri, 0, 
+												  kind, 0, 
 												  on_got_handle,
 												  item);
 
@@ -416,15 +417,16 @@
 {
 }
 
-void hildon_albumart_factory_remove(const gchar *artist, const gchar *album, const gchar *uri)
+void hildon_albumart_factory_remove(const gchar *artist_or_title, const gchar *album, const gchar *kind)
 {
+	const gchar *artist = artist_or_title;
 
 	init();
 
 	com_nokia_albumart_Requester_delete_async (proxy, 
 											   artist, 
 											   album, 
-											   uri, 
+											   kind, 
 											   file_opp_reply, NULL);
 
 }

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.h
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.h	2008-10-14 10:36:17 UTC (rev 16388)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.h	2008-10-14 10:49:23 UTC (rev 16389)
@@ -74,7 +74,7 @@
 
 HildonAlbumartRequest*
 	 hildon_albumart_factory_queue (HildonAlbumartFactory *self,
-									 const gchar *artist, const gchar *album, const gchar *uri,
+									 const gchar *artist_or_title, const gchar *album, const gchar *kind,
 									 HildonAlbumartRequestCallback callback,
 									 gpointer user_data,
 									 GDestroyNotify destroy);
@@ -123,7 +123,7 @@
  *  a critical error
  */
 HildonAlbumartFactoryHandle hildon_albumart_factory_load(
-            const gchar *artist, const gchar *album, const gchar *uri,
+            const gchar *artist_or_title, const gchar *album, const gchar *kind,
             HildonAlbumartFactoryFinishedCallback callback,
             gpointer user_data);
 
@@ -143,7 +143,7 @@
  *
  * Call to indicate the a file was removed and the albumart cache should be updated
  */
-void hildon_albumart_factory_remove(const gchar *artist, const gchar *album, const gchar *uri);
+void hildon_albumart_factory_remove(const gchar *artist_or_title, const gchar *album, const gchar *kind);
 
 /**
  * hildon_albumart_factory_wait:

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-obj.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-obj.c	2008-10-14 10:36:17 UTC (rev 16388)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-obj.c	2008-10-14 10:49:23 UTC (rev 16389)
@@ -80,7 +80,7 @@
 
 HildonAlbumartRequest*
 hildon_albumart_factory_queue (HildonAlbumartFactory *self,
-			       const gchar *artist, const gchar *album, const gchar *uri,
+			       const gchar *artist_or_title, const gchar *album, const gchar *kind,
 			       HildonAlbumartRequestCallback callback,
 			       gpointer user_data,
 			       GDestroyNotify destroy)
More information about the maemo-commits mailing list