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

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-11-13 15:59:05 +0200 (Thu, 13 Nov 2008)
New Revision: 16659

Added:
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c
Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/Makefile.am
Log:
2008-11-13  Philip Van Hoof  <philip at codeminded.be>

	* daemon/plugins/gdkpixbuf-png-out-plugin.c
	* daemon/plugins/Makefile.am: Added a PNG output plugin, this plugin is
	inactive by default (our default is JPEG, although indeed the FDO
	thumbnail-spec wants PNG - we don't believe PNG is the right format for
	thumbnails on the device -). 



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-13 13:50:09 UTC (rev 16658)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-13 13:59:05 UTC (rev 16659)
@@ -1,5 +1,13 @@
 2008-11-13  Philip Van Hoof  <philip at codeminded.be>
 
+	* daemon/plugins/gdkpixbuf-png-out-plugin.c
+	* daemon/plugins/Makefile.am: Added a PNG output plugin, this plugin is
+	inactive by default (our default is JPEG, although indeed the FDO
+	thumbnail-spec wants PNG - we don't believe PNG is the right format for
+	thumbnails on the device -). 
+
+2008-11-13  Philip Van Hoof  <philip at codeminded.be>
+
 	* daemon/plugins/Makefile.am
 	* daemon/plugins/gstreamer-video-plugin.c: Removed GdkPixbuf dependency
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/Makefile.am	2008-11-13 13:50:09 UTC (rev 16658)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/Makefile.am	2008-11-13 13:59:05 UTC (rev 16659)
@@ -3,7 +3,8 @@
 
 outputpluginsdir = $(libdir)/hildon-thumbnailer/output-plugins
 
-outputplugins_LTLIBRARIES = libhildon-thumbnailer-jpeg.la
+outputplugins_LTLIBRARIES = libhildon-thumbnailer-jpeg.la \
+			libhildon-thumbnailer-png.la
 
 plugins_LTLIBRARIES = libhildon-thumbnailer-gdkpixbuf.la \
 	              libhildon-thumbnailer-exec.la
@@ -35,6 +36,11 @@
 libhildon_thumbnailer_jpeg_la_CFLAGS = $(libhildon_thumbnailer_gdkpixbuf_la_CFLAGS)
 libhildon_thumbnailer_jpeg_la_LIBADD = $(libhildon_thumbnailer_gdkpixbuf_la_LIBADD)
 
+libhildon_thumbnailer_png_la_SOURCES = gdkpixbuf-png-out-plugin.c
+libhildon_thumbnailer_png_la_LDFLAGS = $(plugin_flags)
+libhildon_thumbnailer_png_la_CFLAGS = $(libhildon_thumbnailer_gdkpixbuf_la_CFLAGS)
+libhildon_thumbnailer_png_la_LIBADD = $(libhildon_thumbnailer_gdkpixbuf_la_LIBADD)
+
 libhildon_thumbnailer_exec_la_CFLAGS = \
 	-I. -I$(top_srcdir)/daemon \
 	-I$(top_srcdir)/thumbs \

Copied: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c (from rev 16657, 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 12:23:57 UTC (rev 16657)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2008-11-13 13:59:05 UTC (rev 16659)
@@ -0,0 +1,176 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * This file is part of hildon-thumbnail package
+ *
+ * Copyright (C) 2005 Nokia Corporation.  All Rights reserved.
+ *
+ * Contact: Marius Vollmer <marius.vollmer at nokia.com>
+ * Author: Philip Van Hoof <philip at codeminded.be>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR  PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+#include <glib.h>
+#include <gio/gio.h>
+#include <dbus/dbus-glib-bindings.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk-pixbuf/gdk-pixbuf-io.h>
+
+#include "utils.h"
+#include "hildon-thumbnail-plugin.h"
+
+static gboolean had_init = FALSE;
+static gboolean is_active = FALSE;
+
+#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"
+
+void
+hildon_thumbnail_outplugin_out (const guchar *rgb8_pixmap, 
+						guint width, guint height,
+						guint rowstride, guint bits_per_sample,
+						OutType type,
+						guint64 mtime, 
+						const gchar *uri, 
+						GError **error)
+{
+	GdkPixbuf *pixbuf;
+	gchar *large, *normal, *cropped, *filen;
+	char mtime_str[64];
+
+	const char *default_keys[] = {
+		URI_OPTION,
+		MTIME_OPTION,
+		SOFTWARE_OPTION,
+		NULL
+	};
+
+	const char *default_values[] = {
+		uri,
+		mtime_str,
+		HILDON_THUMBNAIL_APPLICATION "-" VERSION,
+		NULL
+	};
+
+	hildon_thumbnail_util_get_thumb_paths (uri, &large, &normal, &cropped,
+					       NULL, NULL, NULL, TRUE);
+
+	switch (type) {
+		case OUTTYPE_LARGE:
+			filen = large;
+		break;
+		case OUTTYPE_NORMAL:
+			filen = normal;
+		break;
+		case OUTTYPE_CROPPED:
+			filen = cropped;
+		break;
+	}
+
+	pixbuf = gdk_pixbuf_new_from_data ((const guchar*) rgb8_pixmap, 
+					   GDK_COLORSPACE_RGB, FALSE, 
+					   bits_per_sample, width, height, rowstride,
+					   NULL, NULL);
+
+
+	g_sprintf(mtime_str, "%lu", mtime);
+
+	 gdk_pixbuf_savev (pixbuf, filen, "png", 
+			  (char **) default_keys, 
+			  (char **) default_values, 
+			  error);
+
+	g_object_unref (pixbuf);
+
+	g_free (normal);
+	g_free (large);
+	g_free (cropped);
+
+	return;
+}
+
+
+
+static void
+reload_config (const gchar *config) 
+{
+	GKeyFile *keyfile;
+	GStrv mimetypes;
+	guint i = 0, length;
+	GError *error = NULL;
+
+	keyfile = g_key_file_new ();
+
+	if (!g_key_file_load_from_file (keyfile, config, G_KEY_FILE_NONE, NULL)) {
+		is_active = FALSE;
+		g_key_file_free (keyfile);
+		return;
+	}
+
+	is_active = g_key_file_get_boolean (keyfile, "Hildon Thumbnailer", "IsActive", &error);
+
+	if (error) {
+		is_active = FALSE;
+		g_error_free (error);
+	}
+
+	g_key_file_free (keyfile);
+}
+
+
+static void 
+on_file_changed (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data)
+{
+	if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT || event_type == G_FILE_MONITOR_EVENT_CREATED) {
+		gchar *config = g_file_get_path (file);
+		reload_config (config);
+		g_free (config);
+	}
+}
+
+gboolean
+hildon_thumbnail_outplugin_is_active (void) 
+{
+	if (!had_init) {
+		gchar *config = g_build_filename (g_get_user_config_dir (), "hildon-thumbnailer", "gdkpixbuf-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);
+
+		g_signal_connect (G_OBJECT (monitor), "changed", 
+				  G_CALLBACK (on_file_changed), NULL);
+
+		/* g_object_unref (monitor); */
+		g_object_unref (file);
+
+		reload_config (config);
+
+		had_init = TRUE;
+	}
+
+	return is_active;
+}