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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Mon Nov 17 17:47:06 EET 2008
Author: pvanhoof
Date: 2008-11-17 17:47:03 +0200 (Mon, 17 Nov 2008)
New Revision: 16707

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c
   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/plugins/epeg-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
Log:
2008-11-17  Philip Van Hoof  <philip at codeminded.be>

	* daemon/hildon-thumbnail-daemon.c
	* daemon/hildon-thumbnail-plugin.h
	* daemon/plugins/gdkpixbuf-plugin.c
	* daemon/plugins/exec-plugin.c
	* daemon/plugins/gdkpixbuf-png-out-plugin.c
	* daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
	* daemon/plugins/gstreamer-video-plugin.c
	* daemon/plugins/epeg-plugin.c
	* daemon/hildon-thumbnail-plugin.c: Namespacing public plugin
	API



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-17 14:43:12 UTC (rev 16706)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-17 15:47:03 UTC (rev 16707)
@@ -1,9 +1,22 @@
 2008-11-17  Philip Van Hoof  <philip at codeminded.be>
 
+	* daemon/hildon-thumbnail-daemon.c
 	* daemon/hildon-thumbnail-plugin.h
 	* daemon/plugins/gdkpixbuf-plugin.c
+	* daemon/plugins/exec-plugin.c
+	* daemon/plugins/gdkpixbuf-png-out-plugin.c
+	* daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
 	* daemon/plugins/gstreamer-video-plugin.c
 	* daemon/plugins/epeg-plugin.c
+	* daemon/hildon-thumbnail-plugin.c: Namespacing public plugin
+	API
+
+2008-11-17  Philip Van Hoof  <philip at codeminded.be>
+
+	* daemon/hildon-thumbnail-plugin.h
+	* daemon/plugins/gdkpixbuf-plugin.c
+	* daemon/plugins/gstreamer-video-plugin.c
+	* daemon/plugins/epeg-plugin.c
 	* daemon/hildon-thumbnail-plugin.c: Performance improvements:
 	avoiding rescaling when there's no need to recreate the thumbnail
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c	2008-11-17 14:43:12 UTC (rev 16706)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c	2008-11-17 15:47:03 UTC (rev 16707)
@@ -89,7 +89,7 @@
 		module = hildon_thumbnail_plugin_load (full);
 		if (module)
 			hildon_thumbnail_plugin_do_init (module, &cropping,
-							 (register_func) thumbnailer_register_plugin,
+							 (hildon_thumbnail_register_func) thumbnailer_register_plugin,
 							 thumbnailer,
 							 &error);
 		if (error) {
@@ -204,7 +204,7 @@
 					GError *error = NULL;
 
 					hildon_thumbnail_plugin_do_init (module, &cropping,
-							 (register_func) thumbnailer_register_plugin,
+							 (hildon_thumbnail_register_func) thumbnailer_register_plugin,
 							 thumbnailer,
 							 &error);
 					if (error) {

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-11-17 14:43:12 UTC (rev 16706)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-11-17 15:47:03 UTC (rev 16707)
@@ -79,15 +79,13 @@
 
 
 
-typedef gboolean (*NeedsOutFunc) (OutType type,
-			 	  guint64 mtime, 
-			 	  const gchar *uri);
+typedef gboolean (*NeedsOutFunc) (HildonThumbnailPluginOutType type,
+				  guint64 mtime, const gchar *uri);
 
 
 gboolean
-hildon_thumbnail_outplugins_needs_out (OutType type,
-				       guint64 mtime, 
-				       const gchar *uri)
+hildon_thumbnail_outplugins_needs_out (HildonThumbnailPluginOutType type,
+				       guint64 mtime, const gchar *uri)
 {
 	GList *copy = g_list_copy (outplugs);
 	gboolean retval = FALSE;
@@ -119,22 +117,17 @@
 }
 
 
-typedef void (*OutFunc) (const guchar *rgb8_pixmap, 
-			 guint width, guint height,
-			 guint rowstride, guint bits_per_sample,
-			 OutType type,
-			 guint64 mtime, 
-			 const gchar *uri, 
-			 GError **error);
+typedef void (*OutFunc) (const guchar *rgb8_pixmap, guint width, guint height, 
+			 guint rowstride, guint bits_per_sample, 
+			 HildonThumbnailPluginOutType type, guint64 mtime, 
+			 const gchar *uri, GError **error);
 
 void
-hildon_thumbnail_outplugins_do_out (const guchar *rgb8_pixmap, 
-				    guint width, guint height,
-				    guint rowstride, guint bits_per_sample,
-				    OutType type,
-				    guint64 mtime, 
-				    const gchar *uri, 
-				    GError **error)
+hildon_thumbnail_outplugins_do_out (const guchar *rgb8_pixmap,  guint width, 
+				    guint height, guint rowstride, 
+				    guint bits_per_sample, 
+				    HildonThumbnailPluginOutType type, guint64 mtime, 
+				    const gchar *uri, GError **error)
 {
 	GList *copy = g_list_copy (outplugs);
 	GString *errors = NULL;
@@ -228,10 +221,11 @@
 }
 
 
-typedef void (*InitFunc) (gboolean *cropping, register_func func, gpointer instance, GModule *module, GError **error);
+typedef void (*InitFunc) (gboolean *cropping, hildon_thumbnail_register_func func, 
+			  gpointer instance, GModule *module, GError **error);
 
 void
-hildon_thumbnail_plugin_do_init (GModule *module, gboolean *cropping, register_func in_func, gpointer instance, GError **error)
+hildon_thumbnail_plugin_do_init (GModule *module, gboolean *cropping, hildon_thumbnail_register_func in_func, gpointer instance, GError **error)
 {
 	InitFunc func;
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2008-11-17 14:43:12 UTC (rev 16706)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2008-11-17 15:47:03 UTC (rev 16707)
@@ -34,18 +34,22 @@
 G_BEGIN_DECLS
 
 typedef enum {
-	OUTTYPE_LARGE,
-	OUTTYPE_NORMAL,
-	OUTTYPE_CROPPED,
-} OutType;
+	HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE,
+	HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL,
+	HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED,
+} HildonThumbnailPluginOutType;
 
-typedef void (*register_func) (gpointer self, const gchar *mime_type, GModule *module, const GStrv uri_schemes, gint priority);
+typedef void (*hildon_thumbnail_register_func)    (gpointer self, 
+						   const gchar *mime_type, 
+						   GModule *module, 
+						   const GStrv uri_schemes, 
+						   gint priority);
 
 GModule *   hildon_thumbnail_plugin_load          (const gchar *module_name);
 GStrv       hildon_thumbnail_plugin_get_supported (GModule *module);
 void        hildon_thumbnail_plugin_do_init       (GModule *module, 
 						   gboolean *cropping,
-						   register_func func,
+						   hildon_thumbnail_register_func func,
 						   gpointer self,
 						   GError **error);
 void        hildon_thumbnail_plugin_do_create     (GModule *module, 
@@ -61,11 +65,11 @@
 void        hildon_thumbnail_outplugins_do_out    (const guchar *rgb8_pixmap, 
 						   guint width, guint height,
 						   guint rowstride, guint bits_per_sample,
-						   OutType type,
+						   HildonThumbnailPluginOutType type,
 						   guint64 mtime, 
 						   const gchar *uri, 
 						   GError **error);
-gboolean    hildon_thumbnail_outplugins_needs_out (OutType type,
+gboolean    hildon_thumbnail_outplugins_needs_out (HildonThumbnailPluginOutType type,
 						   guint64 mtime, 
 						   const gchar *uri);
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2008-11-17 14:43:12 UTC (rev 16706)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2008-11-17 15:47:03 UTC (rev 16707)
@@ -182,9 +182,9 @@
 
 		mtime = g_file_info_get_attribute_uint64 (finfo, G_FILE_ATTRIBUTE_TIME_MODIFIED);
 
-		if (!hildon_thumbnail_outplugins_needs_out (OUTTYPE_LARGE, mtime, uri) &&
-		    !hildon_thumbnail_outplugins_needs_out (OUTTYPE_NORMAL, mtime, uri) &&
-		    !hildon_thumbnail_outplugins_needs_out (OUTTYPE_CROPPED, mtime, uri))
+		if (!hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE, mtime, uri) &&
+		    !hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL, mtime, uri) &&
+		    !hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED, mtime, uri))
 			goto nerror_handler;
 
 		im = epeg_file_open (path);
@@ -224,7 +224,7 @@
 									  destroy_pixbuf, im);
 		}
 
-		if (hildon_thumbnail_outplugins_needs_out (OUTTYPE_LARGE, mtime, uri)) {
+		if (hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE, mtime, uri)) {
 
 			rgb8_pixels = gdk_pixbuf_get_pixels (pixbuf_large);
 			width = gdk_pixbuf_get_width (pixbuf_large);
@@ -235,7 +235,7 @@
 							    width,
 							    height,
 							    rowstride, 8,
-							    OUTTYPE_LARGE,
+							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE,
 							    mtime, uri, 
 							    &nerror);
 		}
@@ -243,7 +243,7 @@
 		if (nerror)
 			goto nerror_handler;
 
-		if (do_cropped && hildon_thumbnail_outplugins_needs_out (OUTTYPE_CROPPED, mtime, uri)) {
+		if (do_cropped && hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED, mtime, uri)) {
 
 			pixbuf_cropped = crop_resize (pixbuf_large, 124, 124);
 
@@ -256,7 +256,7 @@
 							    width,
 							    height,
 							    rowstride, 8,
-							    OUTTYPE_CROPPED,
+							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED,
 							    mtime, uri, 
 							    &nerror);
 
@@ -268,7 +268,7 @@
 			goto nerror_handler;
 
 
-		if (hildon_thumbnail_outplugins_needs_out (OUTTYPE_NORMAL, mtime, uri)) {
+		if (hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL, mtime, uri)) {
 
 			pixbuf_normal = gdk_pixbuf_scale_simple (pixbuf_large,
 								 128, 128,
@@ -283,7 +283,7 @@
 							    width,
 							    height,
 							    rowstride, 8,
-							    OUTTYPE_NORMAL,
+							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL,
 							    mtime, uri, 
 							    &nerror);
 
@@ -399,7 +399,7 @@
 }
 
 void 
-hildon_thumbnail_plugin_init (gboolean *cropping, register_func func, gpointer thumbnailer, GModule *module, GError **error)
+hildon_thumbnail_plugin_init (gboolean *cropping, hildon_thumbnail_register_func func, gpointer thumbnailer, GModule *module, GError **error)
 {
 	gchar *config = g_build_filename (g_get_user_config_dir (), "hildon-thumbnailer", "epeg-plugin.conf", NULL);
 	GFile *file = g_file_new_for_path (config);

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c	2008-11-17 14:43:12 UTC (rev 16706)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c	2008-11-17 15:47:03 UTC (rev 16707)
@@ -411,7 +411,7 @@
 }
 
 void 
-hildon_thumbnail_plugin_init (gboolean *cropping, register_func func, gpointer thumbnailer, GModule *module, GError **error)
+hildon_thumbnail_plugin_init (gboolean *cropping, hildon_thumbnail_register_func func, gpointer thumbnailer, GModule *module, GError **error)
 {
 	gchar *config = g_build_filename (g_get_user_config_dir (), "hildon-thumbnailer", "exec-plugin.conf", NULL);
 	GFile *file = g_file_new_for_path (config);

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-11-17 14:43:12 UTC (rev 16706)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-11-17 15:47:03 UTC (rev 16707)
@@ -49,7 +49,7 @@
 
 
 gboolean
-hildon_thumbnail_outplugin_needs_out (OutType type, guint64 mtime, const gchar *uri)
+hildon_thumbnail_outplugin_needs_out (HildonThumbnailPluginOutType type, guint64 mtime, const gchar *uri)
 {
 	gboolean retval;
 	gchar *large, *normal, *cropped, *filen;
@@ -58,13 +58,13 @@
 					       NULL, NULL, NULL, FALSE);
 
 	switch (type) {
-		case OUTTYPE_LARGE:
+		case HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE:
 			filen = large;
 		break;
-		case OUTTYPE_NORMAL:
+		case HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL:
 			filen = normal;
 		break;
-		case OUTTYPE_CROPPED:
+		case HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED:
 			filen = cropped;
 		break;
 	}
@@ -90,7 +90,7 @@
 hildon_thumbnail_outplugin_out (const guchar *rgb8_pixmap, 
 				guint width, guint height,
 				guint rowstride, guint bits_per_sample,
-				OutType type,
+				HildonThumbnailPluginOutType type,
 				guint64 mtime, 
 				const gchar *uri, 
 				GError **error)
@@ -103,13 +103,13 @@
 					       NULL, NULL, NULL, FALSE);
 
 	switch (type) {
-		case OUTTYPE_LARGE:
+		case HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE:
 			filen = large;
 		break;
-		case OUTTYPE_NORMAL:
+		case HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL:
 			filen = normal;
 		break;
-		case OUTTYPE_CROPPED:
+		case HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED:
 			filen = cropped;
 		break;
 	}

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-11-17 14:43:12 UTC (rev 16706)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-11-17 15:47:03 UTC (rev 16707)
@@ -190,9 +190,9 @@
 
 		mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
 
-		if (!hildon_thumbnail_outplugins_needs_out (OUTTYPE_LARGE, mtime, uri) &&
-		    !hildon_thumbnail_outplugins_needs_out (OUTTYPE_NORMAL, mtime, uri) &&
-		    !hildon_thumbnail_outplugins_needs_out (OUTTYPE_CROPPED, mtime, uri))
+		if (!hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE, mtime, uri) &&
+		    !hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL, mtime, uri) &&
+		    !hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED, mtime, uri))
 			goto nerror_handler;
 
 		stream = g_file_read (file, NULL, &nerror);
@@ -200,7 +200,7 @@
 		if (nerror)
 			goto nerror_handler;
 
-		if (hildon_thumbnail_outplugins_needs_out (OUTTYPE_LARGE, mtime, uri)) {
+		if (hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE, mtime, uri)) {
 
 			pixbuf_large = gdk_pixbuf_new_from_stream_at_scale (G_INPUT_STREAM (stream),
 									    256, 256,
@@ -221,7 +221,7 @@
 							    height,
 							    rowstride,
 							    8,
-							    OUTTYPE_LARGE,
+							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE,
 							    mtime, 
 							    uri, 
 							    &nerror);
@@ -239,7 +239,7 @@
 		}
 
 
-		if (hildon_thumbnail_outplugins_needs_out (OUTTYPE_NORMAL, mtime, uri)) {
+		if (hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL, mtime, uri)) {
 
 			pixbuf_normal = gdk_pixbuf_new_from_stream_at_scale (G_INPUT_STREAM (stream),
 									     128, 128,
@@ -260,7 +260,7 @@
 							    height,
 							    rowstride,
 							    8,
-							    OUTTYPE_NORMAL,
+							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL,
 							    mtime, 
 							    uri, 
 							    &nerror);
@@ -277,7 +277,7 @@
 
 		}
 
-		if (do_cropped && hildon_thumbnail_outplugins_needs_out (OUTTYPE_CROPPED, mtime, uri)) {
+		if (do_cropped && hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED, mtime, uri)) {
 
 			pixbuf = gdk_pixbuf_new_from_stream (G_INPUT_STREAM (stream),
 							     NULL,
@@ -300,7 +300,7 @@
 							    height,
 							    rowstride,
 							    8,
-							    OUTTYPE_CROPPED,
+							    HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED,
 							    mtime, 
 							    uri, 
 							    &nerror);
@@ -411,7 +411,7 @@
 }
 
 void 
-hildon_thumbnail_plugin_init (gboolean *cropping, register_func func, gpointer thumbnailer, GModule *module, GError **error)
+hildon_thumbnail_plugin_init (gboolean *cropping, hildon_thumbnail_register_func func, gpointer thumbnailer, GModule *module, GError **error)
 {
 	gchar *config = g_build_filename (g_get_user_config_dir (), "hildon-thumbnailer", "gdkpixbuf-plugin.conf", NULL);
 	GFile *file = g_file_new_for_path (config);

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2008-11-17 14:43:12 UTC (rev 16706)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2008-11-17 15:47:03 UTC (rev 16707)
@@ -54,8 +54,11 @@
 #define SOFTWARE_OPTION "tEXt::Software"
 
 
+//gchar *
+//hildon_thumbnail_outplugin_ (HildonThumbnailPluginOutType type, guint64 mtime, const gchar *uri)
+
 gboolean
-hildon_thumbnail_outplugin_needs_out (OutType type, guint64 mtime, const gchar *uri)
+hildon_thumbnail_outplugin_needs_out (HildonThumbnailPluginOutType type, guint64 mtime, const gchar *uri)
 {
 	gboolean retval;
 	gchar *large, *normal, *cropped, *filen;
@@ -64,13 +67,13 @@
 					       NULL, NULL, NULL, TRUE);
 
 	switch (type) {
-		case OUTTYPE_LARGE:
+		case HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE:
 			filen = large;
 		break;
-		case OUTTYPE_NORMAL:
+		case HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL:
 			filen = normal;
 		break;
-		case OUTTYPE_CROPPED:
+		case HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED:
 			filen = cropped;
 		break;
 	}
@@ -96,7 +99,7 @@
 hildon_thumbnail_outplugin_out (const guchar *rgb8_pixmap, 
 				guint width, guint height,
 				guint rowstride, guint bits_per_sample,
-				OutType type,
+				HildonThumbnailPluginOutType type,
 				guint64 mtime, 
 				const gchar *uri, 
 				GError **error)
@@ -124,13 +127,13 @@
 					       NULL, NULL, NULL, TRUE);
 
 	switch (type) {
-		case OUTTYPE_LARGE:
+		case HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE:
 			filen = large;
 		break;
-		case OUTTYPE_NORMAL:
+		case HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL:
 			filen = normal;
 		break;
-		case OUTTYPE_CROPPED:
+		case HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED:
 			filen = cropped;
 		break;
 	}

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-17 14:43:12 UTC (rev 16706)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-17 15:47:03 UTC (rev 16707)
@@ -47,7 +47,9 @@
 
 typedef struct {
 	const gchar    *uri;
-	OutType         target;
+
+	HildonThumbnailPluginOutType
+		        target;
 	guint           size;
 
 	guint64         mtime;
@@ -86,7 +88,7 @@
 #endif
 
 static gboolean
-create_output (OutType target, unsigned char *data, guint width, guint height, guint bpp, const gchar *uri, guint mtime)
+create_output (HildonThumbnailPluginOutType target, unsigned char *data, guint width, guint height, guint bpp, const gchar *uri, guint mtime)
 {
 	GError *error = NULL;
 
@@ -469,9 +471,9 @@
 
 		mtime = g_file_info_get_attribute_uint64 (finfo, G_FILE_ATTRIBUTE_TIME_MODIFIED);
 
-		if (!hildon_thumbnail_outplugins_needs_out (OUTTYPE_LARGE, mtime, uris[i]) &&
-		    !hildon_thumbnail_outplugins_needs_out (OUTTYPE_NORMAL, mtime, uris[i]) &&
-		    !hildon_thumbnail_outplugins_needs_out (OUTTYPE_CROPPED, mtime, uris[i]))
+		if (!hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE, mtime, uris[i]) &&
+		    !hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL, mtime, uris[i]) &&
+		    !hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED, mtime, uris[i]))
 			goto nerror_handler;
 
 		/* Create the thumbnailer struct */
@@ -486,8 +488,8 @@
 		thumber->uri          = uris[i];
 		
 
-		if (hildon_thumbnail_outplugins_needs_out (OUTTYPE_NORMAL, mtime, uris[i])) {
-			thumber->target       = OUTTYPE_NORMAL;
+		if (hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL, mtime, uris[i])) {
+			thumber->target       = HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL;
 			thumber->size         = 128;
 
 			video_thumbnail_create (thumber, &nerror);
@@ -496,9 +498,9 @@
 				goto nerror_handler;
 		}
 
-		if (hildon_thumbnail_outplugins_needs_out (OUTTYPE_LARGE, mtime, uris[i])) {
+		if (hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE, mtime, uris[i])) {
 
-			thumber->target       = OUTTYPE_LARGE;
+			thumber->target       = HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE;
 			thumber->size         = 256;
 
 			video_thumbnail_create (thumber, &nerror);
@@ -507,8 +509,8 @@
 				goto nerror_handler;
 		}
 
-		if (do_cropped && hildon_thumbnail_outplugins_needs_out (OUTTYPE_CROPPED, mtime, uris[i])) {
-			thumber->target       = OUTTYPE_CROPPED;
+		if (do_cropped && hildon_thumbnail_outplugins_needs_out (HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED, mtime, uris[i])) {
+			thumber->target       = HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED;
 			thumber->size         = 124;
 
 			video_thumbnail_create (thumber, &nerror);
@@ -615,7 +617,7 @@
 }
 
 void 
-hildon_thumbnail_plugin_init (gboolean *cropping, register_func func, gpointer thumbnailer, GModule *module, GError **error)
+hildon_thumbnail_plugin_init (gboolean *cropping, hildon_thumbnail_register_func func, gpointer thumbnailer, GModule *module, GError **error)
 {
 	gchar *config = g_build_filename (g_get_user_config_dir (), "hildon-thumbnailer", "gstreamer-video-plugin.conf", NULL);
 	GFile *file = g_file_new_for_path (config);


More information about the maemo-commits mailing list