[maemo-commits] [maemo-commits] r16438 - in projects/haf/trunk/hildon-thumbnail: . daemon daemon/plugins

Fri Oct 17 18:15:31 EEST 2008

Author: pvanhoof
Date: 2008-10-17 18:15:29 +0300 (Fri, 17 Oct 2008)
New Revision: 16438

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
   projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.xml
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
Log:
2008-10-17  Philip Van Hoof  <philip at codeminded.be>

	* daemon/hildon-thumbnail-plugin.h
	* daemon/plugins/gdkpixbuf-plugin.c
	* daemon/plugins/exec-plugin.c
	* daemon/plugins/gstreamer-video-plugin.c
	* daemon/plugin-runner.c
	* daemon/thumbnailer.c
	* daemon/plugin-runner.xml
	* daemon/hildon-thumbnail-plugin.c: Passing MIME and VFS hinting to the
	specialized thumbnailers and plugins



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================

--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-10-17 14:57:42 UTC (rev 16437)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-10-17 15:15:29 UTC (rev 16438)
@@ -5,6 +5,18 @@
 
 2008-10-17  Philip Van Hoof  <philip at codeminded.be>
 
+	* daemon/hildon-thumbnail-plugin.h
+	* daemon/plugins/gdkpixbuf-plugin.c
+	* daemon/plugins/exec-plugin.c
+	* daemon/plugins/gstreamer-video-plugin.c
+	* daemon/plugin-runner.c
+	* daemon/thumbnailer.c
+	* daemon/plugin-runner.xml
+	* daemon/hildon-thumbnail-plugin.c: Passing MIME and VFS hinting to the
+	specialized thumbnailers and plugins
+
+2008-10-17  Philip Van Hoof  <philip at codeminded.be>
+
 	* thumbs/hildon-thumbnail-factory.c
 	* thumbs/hildon-thumbnail-obj.c
 	* thumbs/hildon-thumbnail-factory.h

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-10-17 14:57:42 UTC (rev 16437)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-10-17 15:15:29 UTC (rev 16438)
@@ -78,14 +78,14 @@
 	}
 }
 
-typedef void (*CreateFunc) (GStrv uris, GError **error);
+typedef void (*CreateFunc) (GStrv uris, gchar *mime_hint, gchar *VFS_id, GError **error);
 
 void 
-hildon_thumbnail_plugin_do_create (GModule *module, GStrv uris, GError **error)
+hildon_thumbnail_plugin_do_create (GModule *module, GStrv uris, gchar *mime_hint, gchar *VFS_id, GError **error)
 {
 	CreateFunc func;
 	if (g_module_symbol (module, "hildon_thumbnail_plugin_create", (gpointer *) &func)) {
-		(func) (uris, error);
+		(func) (uris, mime_hint, VFS_id, error);
 	}
 }
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2008-10-17 14:57:42 UTC (rev 16437)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2008-10-17 15:15:29 UTC (rev 16438)
@@ -42,6 +42,8 @@
 						   GError **error);
 void        hildon_thumbnail_plugin_do_create     (GModule *module, 
 						   GStrv uris, 
+						   gchar *mime_hint, 
+						   gchar *VFS_id,
 						   GError **error);
 void        hildon_thumbnail_plugin_do_stop       (GModule *module);
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c	2008-10-17 14:57:42 UTC (rev 16437)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c	2008-10-17 15:15:29 UTC (rev 16438)
@@ -98,14 +98,14 @@
 }
 
 void 
-daemon_create (Daemon *object, GStrv uris, DBusGMethodInvocation *context)
+daemon_create (Daemon *object, GStrv uris, gchar *mime_hint, gchar *VFS_id, DBusGMethodInvocation *context)
 {
 	DaemonPrivate *priv = DAEMON_GET_PRIVATE (object);
 	GError *error = NULL;
 
 	keep_alive ();
 
-	hildon_thumbnail_plugin_do_create (priv->module, uris, &error);
+	hildon_thumbnail_plugin_do_create (priv->module, uris, mime_hint, VFS_id, &error);
 	if (error) {
 		dbus_g_method_return_error (context, error);
 		g_error_free (error);

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.xml
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.xml	2008-10-17 14:57:42 UTC (rev 16437)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.xml	2008-10-17 15:15:29 UTC (rev 16438)
@@ -4,6 +4,8 @@
     <method name="Create">
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
       <arg type="as" name="uris" direction="in" />
+      <arg type="s" name="mime_hint" direction="in" />
+      <arg type="s" name="VFS_id" direction="in" />
     </method>
   </interface>
 </node>

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c	2008-10-17 14:57:42 UTC (rev 16437)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c	2008-10-17 15:15:29 UTC (rev 16438)
@@ -234,7 +234,7 @@
 
 
 void
-hildon_thumbnail_plugin_create (GStrv uris, GError **error)
+hildon_thumbnail_plugin_create (GStrv uris, gchar *mime_hint, gchar *VFS_id, GError **error)
 {
 	guint i = 0;
 	GString *errors = NULL;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-10-17 14:57:42 UTC (rev 16437)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-10-17 15:15:29 UTC (rev 16438)
@@ -206,7 +206,7 @@
 }
 
 void
-hildon_thumbnail_plugin_create (GStrv uris, GError **error)
+hildon_thumbnail_plugin_create (GStrv uris, gchar *mime_hint, gchar *VFS_id, GError **error)
 {
 	guint i = 0;
 	GString *errors = NULL;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-10-17 14:57:42 UTC (rev 16437)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-10-17 15:15:29 UTC (rev 16438)
@@ -419,7 +419,7 @@
 }
 
 void
-hildon_thumbnail_plugin_create (GStrv uris, GError **error)
+hildon_thumbnail_plugin_create (GStrv uris, gchar *mime_hint, gchar *VFS_id, GError **error)
 {
 	VideoThumbnailer *thumber;
 	gchar *large    = NULL;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-10-17 14:57:42 UTC (rev 16437)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-10-17 15:15:29 UTC (rev 16438)
@@ -355,6 +355,8 @@
 
 			dbus_g_proxy_call (proxy, "Create", &error, 
 					   G_TYPE_STRV, urlss,
+					   G_TYPE_STRING, mime_type,
+					   G_TYPE_STRING, VFS_id,
 					   G_TYPE_INVALID, 
 					   G_TYPE_INVALID);
 
@@ -390,7 +392,7 @@
 
 				keep_alive ();
 
-				hildon_thumbnail_plugin_do_create (module, urlss, &error);
+				hildon_thumbnail_plugin_do_create (module, urlss, mime_type, VFS_id, &error);
 
 				keep_alive ();
 


