[maemo-commits] [maemo-commits] r16394 - in projects/haf/trunk/hildon-thumbnail: . thumbs
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Oct 15 12:23:41 EEST 2008
- Previous message: [maemo-commits] r16393 - in projects/haf/trunk/gtk+: . gtk
- Next message: [maemo-commits] r16395 - projects/haf/trunk/hildon-thumbnail/thumbs
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: pvanhoof Date: 2008-10-15 12:23:35 +0300 (Wed, 15 Oct 2008) New Revision: 16394 Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-obj.c projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c Log: 2008-10-15 Philip Van Hoof <philip at codeminded.be> * thumbs/hildon-thumbnail-obj.c * thumbs/hildon-albumart-obj.c: New client API for album art downloading Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog =================================================================== --- projects/haf/trunk/hildon-thumbnail/ChangeLog 2008-10-15 08:45:48 UTC (rev 16393) +++ projects/haf/trunk/hildon-thumbnail/ChangeLog 2008-10-15 09:23:35 UTC (rev 16394) @@ -1,5 +1,10 @@ 2008-10-15 Philip Van Hoof <philip at codeminded.be> + * thumbs/hildon-thumbnail-obj.c + * thumbs/hildon-albumart-obj.c: New client API for album art downloading + +2008-10-15 Philip Van Hoof <philip at codeminded.be> + * thumbs/hildon-albumart-factory.c * thumbs/hildon-albumart-factory.h: API change Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-obj.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-obj.c 2008-10-15 08:45:48 UTC (rev 16393) +++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-obj.c 2008-10-15 09:23:35 UTC (rev 16394) @@ -22,40 +22,192 @@ * 02110-1301 USA * */ +#include <gio/gio.h> +#include <glib/gfileutils.h> +#include <gdk-pixbuf/gdk-pixbuf.h> #include "hildon-albumart-factory.h" +#include "albumart-client.h" +#include "utils.h" +#define ALBUMARTER_SERVICE "org.freedesktop.albumarter" +#define ALBUMARTER_PATH "/org/freedesktop/albumarter/Generic" +#define ALBUMARTER_INTERFACE "org.freedesktop.albumarter.Generic" #define REQUEST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), HILDON_TYPE_ALBUMART_REQUEST, HildonAlbumartRequestPrivate)) #define FACTORY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), HILDON_TYPE_ALBUMART_FACTORY, HildonAlbumartFactoryPrivate)) + typedef struct { - + gchar *artist_or_title; + gchar *album; + gchar *kind; + gchar *key; + guint width, height; + HildonAlbumartRequestCallback callback; + GDestroyNotify destroy; + HildonAlbumartFactory *factory; + gpointer user_data; } HildonAlbumartRequestPrivate; typedef struct { - + DBusGProxy *proxy; + GHashTable *tasks; } HildonAlbumartFactoryPrivate; + +#ifndef gdk_pixbuf_new_from_stream +/* It's implemented in pixbuf-io-loader.c in this case */ +GdkPixbuf * gdk_pixbuf_new_from_stream (GInputStream *stream, + GCancellable *cancellable, + GError **error); +#endif + + static void +create_pixbuf_and_callback (HildonAlbumartRequestPrivate *r_priv) +{ + GFile *filei = NULL; + GInputStream *stream = NULL; + GdkPixbuf *pixbuf = NULL; + gchar *path; + GError *error = NULL; + + filei = g_file_new_for_path (path); + stream = G_INPUT_STREAM (g_file_read (filei, NULL, &error)); + + if (error) + goto error_handler; + + pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, &error); + + error_handler: + + /* Callback user function, passing the pixbuf and error */ + + if (r_priv->callback) + r_priv->callback (r_priv->factory, pixbuf, error, r_priv->user_data); + + if (r_priv->destroy) + r_priv->destroy (r_priv->destroy); + + /* Cleanup */ + + if (filei) + g_object_unref (filei); + + if (stream) { + g_input_stream_close (G_INPUT_STREAM (stream), NULL, NULL); + g_object_unref (stream); + } + + if (error) + g_error_free (error); + + if (pixbuf) + gdk_pixbuf_unref (pixbuf); +} + + +static void +on_task_finished (DBusGProxy *proxy, + guint handle, + gpointer user_data) +{ + HildonAlbumartFactory *self = user_data; + HildonAlbumartFactoryPrivate *f_priv = FACTORY_GET_PRIVATE (user_data); + gchar *key = g_strdup_printf ("%d", handle); + HildonAlbumartRequest *request = g_hash_table_lookup (f_priv->tasks, key); + + if (request) { + HildonAlbumartRequestPrivate *r_priv = REQUEST_GET_PRIVATE (request); + create_pixbuf_and_callback (r_priv); + g_hash_table_remove (f_priv->tasks, key); + } + + g_free (key); +} + +/* static gboolean + * have_all_for_request_cb (gpointer user_data) + * { + * HildonAlbumartRequestPrivate *r_priv = REQUEST_GET_PRIVATE (user_data); + * create_pixbuf_and_callback (r_priv); + * return FALSE; + * } + **/ + +static void hildon_albumart_factory_init (HildonAlbumartFactory *self) { + GError *error = NULL; + DBusGConnection *connection; + HildonAlbumartFactoryPrivate *f_priv = FACTORY_GET_PRIVATE (self); + + connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); + + if (error) { + g_critical ("Can't initialize HildonAlbumarter: %s\n", error->message); + g_error_free (error); + return; + } + + f_priv->tasks = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify) g_free, + (GDestroyNotify) g_object_unref); + + f_priv->proxy = dbus_g_proxy_new_for_name (connection, + ALBUMARTER_SERVICE, + ALBUMARTER_PATH, + ALBUMARTER_INTERFACE); + + dbus_g_proxy_add_signal (f_priv->proxy, "Finished", + G_TYPE_UINT, G_TYPE_INVALID); + + dbus_g_proxy_connect_signal (f_priv->proxy, "Finished", + G_CALLBACK (on_task_finished), + g_object_ref (self), + (GClosureNotify) g_object_unref); } static void hildon_albumart_request_init (HildonAlbumartRequest *self) { + HildonAlbumartRequestPrivate *r_priv = REQUEST_GET_PRIVATE (self); + + r_priv->key = NULL; + r_priv->artist_or_title = NULL; + r_priv->album = NULL; + r_priv->kind = NULL; + r_priv->factory = NULL; + r_priv->callback = NULL; + r_priv->destroy = NULL; + r_priv->user_data = NULL; } static void hildon_albumart_factory_finalize (GObject *object) { + HildonAlbumartFactoryPrivate *f_priv = FACTORY_GET_PRIVATE (object); + + g_object_unref (f_priv->proxy); + g_hash_table_unref (f_priv->tasks); } static void hildon_albumart_request_finalize (GObject *object) { + HildonAlbumartRequestPrivate *r_priv = REQUEST_GET_PRIVATE (object); + guint i; + + g_free (r_priv->artist_or_title); + g_free (r_priv->album); + g_free (r_priv->kind); + + g_free (r_priv->key); + if (r_priv->factory) + g_object_unref (r_priv->factory); } static void @@ -78,30 +230,93 @@ g_type_class_add_private (object_class, sizeof (HildonAlbumartFactoryPrivate)); } +static void +on_got_handle (DBusGProxy *proxy, guint OUT_handle, GError *error, gpointer userdata) +{ + HildonAlbumartRequest *request = userdata; + HildonAlbumartRequestPrivate *r_priv = REQUEST_GET_PRIVATE (request); + HildonAlbumartFactoryPrivate *f_priv = FACTORY_GET_PRIVATE (r_priv->factory); + + gchar *key = g_strdup_printf ("%d", OUT_handle); + r_priv->key = g_strdup (key); + g_hash_table_replace (f_priv->tasks, key, + g_object_ref (request)); + g_object_unref (request); +} + HildonAlbumartRequest* -hildon_albumart_factory_queue (HildonAlbumartFactory *self, - const gchar *artist_or_title, const gchar *album, const gchar *kind, - HildonAlbumartRequestCallback callback, - gpointer user_data, - GDestroyNotify destroy) +hildon_albumart_factory_request (HildonAlbumartFactory *self, + const gchar *artist_or_title, const gchar *album, const gchar *kind, + HildonAlbumartRequestCallback callback, + gpointer user_data, + GDestroyNotify destroy) { HildonAlbumartRequest *request = g_object_new (HILDON_TYPE_ALBUMART_REQUEST, NULL); + HildonAlbumartRequestPrivate *r_priv = REQUEST_GET_PRIVATE (request); + HildonAlbumartFactoryPrivate *f_priv = FACTORY_GET_PRIVATE (self); + + r_priv->artist_or_title = g_strdup (artist_or_title); + r_priv->album = g_strdup (album); + r_priv->kind = g_strdup (kind); + r_priv->factory = g_object_ref (self); + r_priv->user_data = user_data; + r_priv->callback = callback; + r_priv->destroy = destroy; + + com_nokia_albumart_Requester_queue_async (f_priv->proxy, + r_priv->artist_or_title, + r_priv->album, + r_priv->kind, 0, + on_got_handle, + g_object_ref (request)); + return request; } void hildon_albumart_factory_join (HildonAlbumartFactory *self) { + HildonAlbumartFactoryPrivate *f_priv = FACTORY_GET_PRIVATE (self); + + while(g_hash_table_size (f_priv->tasks) != 0) { + g_main_context_iteration (NULL, TRUE); + } } +static void +on_unqueued (DBusGProxy *proxy, GError *error, gpointer userdata) +{ + HildonAlbumartRequest *request = userdata; + HildonAlbumartRequestPrivate *r_priv = REQUEST_GET_PRIVATE (request); + HildonAlbumartFactoryPrivate *f_priv = FACTORY_GET_PRIVATE (r_priv->factory); + + g_hash_table_remove (f_priv->tasks, r_priv->key); + g_object_unref (request); +} + void hildon_albumart_request_unqueue (HildonAlbumartRequest *self) { + HildonAlbumartRequestPrivate *r_priv = REQUEST_GET_PRIVATE (self); + HildonAlbumartFactoryPrivate *f_priv = FACTORY_GET_PRIVATE (r_priv->factory); + guint handle = atoi (r_priv->key); + + com_nokia_albumart_Requester_unqueue_async (f_priv->proxy, handle, + on_unqueued, + g_object_ref (self)); } void hildon_albumart_request_join (HildonAlbumartRequest *self) { + HildonAlbumartRequestPrivate *r_priv = REQUEST_GET_PRIVATE (self); + HildonAlbumartFactoryPrivate *f_priv = FACTORY_GET_PRIVATE (r_priv->factory); + HildonAlbumartRequest *found = g_hash_table_lookup (f_priv->tasks, r_priv->key); + + while (found) { + g_main_context_iteration (NULL, TRUE); + found = g_hash_table_lookup (f_priv->tasks, r_priv->key); + } } G_DEFINE_TYPE (HildonAlbumartFactory, hildon_albumart_factory, G_TYPE_OBJECT) Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c 2008-10-15 08:45:48 UTC (rev 16393) +++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c 2008-10-15 09:23:35 UTC (rev 16394) @@ -37,8 +37,6 @@ #define REQUEST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), HILDON_TYPE_THUMBNAIL_REQUEST, HildonThumbnailRequestPrivate)) #define FACTORY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), HILDON_TYPE_THUMBNAIL_FACTORY, HildonThumbnailFactoryPrivate)) -extern DBusGProxy *thumb_proxy; - typedef struct { GStrv uris; gchar *key; @@ -57,13 +55,6 @@ } HildonThumbnailFactoryPrivate; -#ifndef gdk_pixbuf_new_from_stream_at_scale -/* It's implemented in pixbuf-io-loader.c in this case */ -GdkPixbuf* gdk_pixbuf_new_from_stream_at_scale (GInputStream *stream, gint width, - gint height, gboolean preserve_aspect_ratio, - GCancellable *cancellable, GError **error); -#endif - #ifndef gdk_pixbuf_new_from_stream /* It's implemented in pixbuf-io-loader.c in this case */ GdkPixbuf * gdk_pixbuf_new_from_stream (GInputStream *stream,
- Previous message: [maemo-commits] r16393 - in projects/haf/trunk/gtk+: . gtk
- Next message: [maemo-commits] r16395 - projects/haf/trunk/hildon-thumbnail/thumbs
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]