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

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-11-13 17:21:24 +0200 (Thu, 13 Nov 2008)
New Revision: 16668

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-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-13  Philip Van Hoof  <philip at codeminded.be>

	* daemon/plugins/gdkpixbuf-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: Code cleanups



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-13 15:13:38 UTC (rev 16667)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-13 15:21:24 UTC (rev 16668)
@@ -1,5 +1,14 @@
 2008-11-13  Philip Van Hoof  <philip at codeminded.be>
 
+	* daemon/plugins/gdkpixbuf-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: Code cleanups
+
+2008-11-13  Philip Van Hoof  <philip at codeminded.be>
+
 	* daemon/hildon-thumbnail-plugin.h
 	* daemon/hildon-thumbnail-daemon.c
 	* daemon/hildon-thumbnail-plugin.c: Bugfixes for loading and unloading

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-11-13 15:13:38 UTC (rev 16667)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-11-13 15:21:24 UTC (rev 16668)
@@ -30,9 +30,17 @@
 
 typedef gboolean (*IsActiveFunc) (void);
 
+typedef void (*StopFunc) (void);
+
 void
 hildon_thumbnail_outplugin_unload (GModule *module)
 {
+	StopFunc stop_func;
+
+	if (g_module_symbol (module, "hildon_thumbnail_outplugin_stop", (gpointer *) &stop_func)) {
+		stop_func ();
+	}
+
 	outplugs = g_list_remove (outplugs, module);
 	g_module_close (module);
 }
@@ -174,8 +182,6 @@
 	}
 }
 
-typedef void (*StopFunc) (void);
-
 void
 hildon_thumbnail_plugin_do_stop (GModule *module)
 {

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2008-11-13 15:13:38 UTC (rev 16667)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2008-11-13 15:21:24 UTC (rev 16668)
@@ -61,14 +61,6 @@
 	return (const gchar**) supported;
 }
 
-
-#define HILDON_THUMBNAIL_OPTION_PREFIX "tEXt::Thumb::"
-#define HILDON_THUMBNAIL_APPLICATION "hildon-thumbnail"
-#define URI_OPTION HILDON_THUMBNAIL_OPTION_PREFIX "URI"
-#define MTIME_OPTION HILDON_THUMBNAIL_OPTION_PREFIX "MTime"
-#define SOFTWARE_OPTION "tEXt::Software"
-
-
 static GdkPixbuf*
 crop_resize (GdkPixbuf *src, int width, int height) {
 	int x = width, y = height;

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-13 15:13:38 UTC (rev 16667)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-11-13 15:21:24 UTC (rev 16668)
@@ -41,6 +41,7 @@
 
 static gboolean had_init = FALSE;
 static gboolean is_active = TRUE;
+static GFileMonitor *monitor = NULL;
 
 void
 hildon_thumbnail_outplugin_out (const guchar *rgb8_pixmap, 
@@ -125,13 +126,19 @@
 	}
 }
 
+void
+hildon_thumbnail_outplugin_stop (void) 
+{
+	if (monitor)
+		g_object_unref (monitor);
+}
+
 gboolean
 hildon_thumbnail_outplugin_is_active (void) 
 {
 	if (!had_init) {
 		gchar *config = g_build_filename (g_get_user_config_dir (), "hildon-thumbnailer", "gdkpixbuf-jpeg-output-plugin.conf", NULL);
 		GFile *file = g_file_new_for_path (config);
-		GFileMonitor *monitor;
 
 		monitor =  g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, NULL);
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-11-13 15:13:38 UTC (rev 16667)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-11-13 15:21:24 UTC (rev 16668)
@@ -89,14 +89,6 @@
 	return (const gchar**) supported;
 }
 
-#define HILDON_THUMBNAIL_OPTION_PREFIX "tEXt::Thumb::"
-#define HILDON_THUMBNAIL_APPLICATION "hildon-thumbnail"
-#define URI_OPTION HILDON_THUMBNAIL_OPTION_PREFIX "URI"
-#define MTIME_OPTION HILDON_THUMBNAIL_OPTION_PREFIX "MTime"
-#define SOFTWARE_OPTION "tEXt::Software"
-
-
-
 static GdkPixbuf*
 crop_resize (GdkPixbuf *src, int width, int height) {
 	int x = width, y = height;
@@ -243,7 +235,7 @@
 						    gdk_pixbuf_get_width     (pixbuf_normal),
 						    gdk_pixbuf_get_height    (pixbuf_normal),
 						    gdk_pixbuf_get_rowstride (pixbuf_normal),
-						   8,
+						    8,
 						    OUTTYPE_NORMAL,
 						    mtime, 
 						    uri, 

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-13 15:13:38 UTC (rev 16667)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2008-11-13 15:21:24 UTC (rev 16668)
@@ -41,6 +41,7 @@
 
 static gboolean had_init = FALSE;
 static gboolean is_active = FALSE;
+static GFileMonitor *monitor = NULL;
 
 #define HILDON_THUMBNAIL_OPTION_PREFIX "tEXt::Thumb::"
 #define HILDON_THUMBNAIL_APPLICATION "hildon-thumbnail"
@@ -96,7 +97,7 @@
 					   NULL, NULL);
 
 
-	g_sprintf(mtime_str, "%lu", mtime);
+	g_sprintf (mtime_str, "%lu", mtime);
 
 	 gdk_pixbuf_savev (pixbuf, filen, "png", 
 			  (char **) default_keys, 
@@ -151,13 +152,19 @@
 	}
 }
 
+void
+hildon_thumbnail_outplugin_stop (void) 
+{
+	if (monitor)
+		g_object_unref (monitor);
+}
+
 gboolean
 hildon_thumbnail_outplugin_is_active (void) 
 {
 	if (!had_init) {
 		gchar *config = g_build_filename (g_get_user_config_dir (), "hildon-thumbnailer", "gdkpixbuf-png-output-plugin.conf", NULL);
 		GFile *file = g_file_new_for_path (config);
-		GFileMonitor *monitor;
 
 		monitor =  g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, 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-11-13 15:13:38 UTC (rev 16667)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-13 15:21:24 UTC (rev 16668)
@@ -39,12 +39,6 @@
 #define GSTP_ERROR_DOMAIN	"HildonThumbnailerGStreamerVideoPlugin"
 #define GSTP_ERROR		g_quark_from_static_string (GSTP_ERROR_DOMAIN)
 
-#define HILDON_THUMBNAIL_OPTION_PREFIX "tEXt::Thumb::"
-#define HILDON_THUMBNAIL_APPLICATION "hildon-thumbnail"
-#define URI_OPTION HILDON_THUMBNAIL_OPTION_PREFIX "URI"
-#define MTIME_OPTION HILDON_THUMBNAIL_OPTION_PREFIX "MTime"
-#define SOFTWARE_OPTION "tEXt::Software"
-
 static gchar *supported[] = { "video/mp4", "video/mpeg", NULL };
 static gboolean do_cropped = TRUE;
 static gboolean do_vidthumbs = TRUE;