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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Mon Nov 17 17:56:38 EET 2008 
Author: pvanhoof
Date: 2008-11-17 17:56:35 +0200 (Mon, 17 Nov 2008)
New Revision: 16708

Added:
   projects/haf/trunk/hildon-thumbnail/daemon/plugin/
   projects/haf/trunk/hildon-thumbnail/daemon/plugin/Makefile.am
   projects/haf/trunk/hildon-thumbnail/daemon/plugin/hildon-thumbnail-plugin.h
Removed:
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/configure.ac
   projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am
   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/plugin-runner.c
   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
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
   projects/haf/trunk/hildon-thumbnail/debian/libhildon-thumbnail-dev.install
Log:
2008-11-17  Philip Van Hoof  <philip at codeminded.be>

	* debian/libhildon-thumbnail-dev.install
	* configure.ac
	* 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/plugin-runner.c
	* daemon/thumbnailer.c
	* daemon/plugin
	* daemon/plugin/hildon-thumbnail-plugin.h
	* daemon/plugin/Makefile.am
	* daemon/Makefile.am
	* daemon/hildon-thumbnail-plugin.c: Making the plugin API public



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-17 15:56:35 UTC (rev 16708)
@@ -1,5 +1,7 @@
 2008-11-17  Philip Van Hoof  <philip at codeminded.be>
 
+	* debian/libhildon-thumbnail-dev.install
+	* configure.ac
 	* daemon/hildon-thumbnail-daemon.c
 	* daemon/hildon-thumbnail-plugin.h
 	* daemon/plugins/gdkpixbuf-plugin.c
@@ -8,6 +10,24 @@
 	* daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
 	* daemon/plugins/gstreamer-video-plugin.c
 	* daemon/plugins/epeg-plugin.c
+	* daemon/plugin-runner.c
+	* daemon/thumbnailer.c
+	* daemon/plugin
+	* daemon/plugin/hildon-thumbnail-plugin.h
+	* daemon/plugin/Makefile.am
+	* daemon/Makefile.am
+	* daemon/hildon-thumbnail-plugin.c: Making the plugin API public
+
+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/configure.ac
===================================================================
--- projects/haf/trunk/hildon-thumbnail/configure.ac	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/configure.ac	2008-11-17 15:56:35 UTC (rev 16708)
@@ -177,6 +177,7 @@
 
 AC_OUTPUT(Makefile \
 	  daemon/Makefile \
+	  daemon/plugin/Makefile \
 	  daemon/plugins/Makefile \
 	  thumbs/Makefile \
           albumart-providers/Makefile \

Modified: projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am	2008-11-17 15:56:35 UTC (rev 16708)
@@ -1,6 +1,6 @@
-SUBDIRS = . plugins
+SUBDIRS = . plugin plugins
 
-INCLUDES = \
+INCLUDES = -I. \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GMODULE_CFLAGS) \

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c	2008-11-17 15:56:35 UTC (rev 16708)
@@ -27,7 +27,7 @@
 #include <dbus/dbus-glib-bindings.h>
 #include <gio/gio.h>
 
-#include "hildon-thumbnail-plugin.h"
+#include <plugin/hildon-thumbnail-plugin.h>
 
 #include "thumbnailer.h"
 #include "albumart.h"

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
@@ -24,7 +24,7 @@
  *
  */
 
-#include "hildon-thumbnail-plugin.h"
+#include <plugin/hildon-thumbnail-plugin.h>
 
 static GList *outplugs = NULL;
 static GStaticRecMutex mutex = G_STATIC_REC_MUTEX_INIT;

Deleted: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2008-11-17 15:56:35 UTC (rev 16708)
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#ifndef __HILDON_THUMBNAIL_PLUGIN_H__
-#define __HILDON_THUMBNAIL_PLUGIN_H__
-
-/*
- * 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 A 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
- *
- */
-
-#include <glib.h>
-#include <gmodule.h>
-#include <dbus/dbus-glib-bindings.h>
-
-G_BEGIN_DECLS
-
-typedef enum {
-	HILDON_THUMBNAIL_PLUGIN_OUTTYPE_LARGE,
-	HILDON_THUMBNAIL_PLUGIN_OUTTYPE_NORMAL,
-	HILDON_THUMBNAIL_PLUGIN_OUTTYPE_CROPPED,
-} HildonThumbnailPluginOutType;
-
-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,
-						   hildon_thumbnail_register_func func,
-						   gpointer self,
-						   GError **error);
-void        hildon_thumbnail_plugin_do_create     (GModule *module, 
-						   GStrv uris, 
-						   gchar *mime_hint,
-						   GStrv *failed_uris, 
-						   GError **error);
-void        hildon_thumbnail_plugin_do_stop       (GModule *module);
-
-
-GModule*    hildon_thumbnail_outplugin_load       (const gchar *module_name);
-void        hildon_thumbnail_outplugin_unload     (GModule *module);
-void        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);
-gboolean    hildon_thumbnail_outplugins_needs_out (HildonThumbnailPluginOutType type,
-						   guint64 mtime, 
-						   const gchar *uri);
-
-G_END_DECLS
-
-#endif


Property changes on: projects/haf/trunk/hildon-thumbnail/daemon/plugin
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Added: projects/haf/trunk/hildon-thumbnail/daemon/plugin/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugin/Makefile.am	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugin/Makefile.am	2008-11-17 15:56:35 UTC (rev 16708)
@@ -0,0 +1,3 @@
+libhildonthumbnailplugindir=$(includedir)/hildon-thumbnail/plugin
+libhildonthumbnailplugin_HEADERS = hildon-thumbnail-plugin.h
+

Copied: projects/haf/trunk/hildon-thumbnail/daemon/plugin/hildon-thumbnail-plugin.h (from rev 16707, projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h)

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c	2008-11-17 15:56:35 UTC (rev 16708)
@@ -29,7 +29,7 @@
 #include <gio/gio.h>
 #include <dbus/dbus-glib-bindings.h>
 
-#include "hildon-thumbnail-plugin.h"
+#include <plugin/hildon-thumbnail-plugin.h>
 
 #define MANAGER_SERVICE        "org.freedesktop.thumbnailer"
 #define MANAGER_PATH           "/org/freedesktop/thumbnailer/Manager"

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
@@ -42,9 +42,10 @@
 
 #include "utils.h"
 #include "epeg-plugin.h"
-#include "hildon-thumbnail-plugin.h"
 
+#include <plugin/hildon-thumbnail-plugin.h>
 
+
 static gchar **supported = NULL;
 static gboolean do_cropped = TRUE;
 static GFileMonitor *monitor = NULL;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
@@ -40,8 +40,8 @@
 
 #include "utils.h"
 #include "exec-plugin.h"
-#include "hildon-thumbnail-plugin.h"
 
+#include <plugin/hildon-thumbnail-plugin.h>
 
 static gchar **supported = NULL;
 static gboolean do_cropped = TRUE;

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 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
@@ -41,8 +41,9 @@
 #include <gdk-pixbuf/gdk-pixbuf-io.h>
 
 #include "utils.h"
-#include "hildon-thumbnail-plugin.h"
 
+#include <plugin/hildon-thumbnail-plugin.h>
+
 static gboolean had_init = FALSE;
 static gboolean is_active = TRUE;
 static GFileMonitor *monitor = NULL;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
@@ -42,8 +42,9 @@
 
 #include "utils.h"
 #include "gdkpixbuf-plugin.h"
-#include "hildon-thumbnail-plugin.h"
 
+#include <plugin/hildon-thumbnail-plugin.h>
+
 #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,

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 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
@@ -41,8 +41,9 @@
 #include <gdk-pixbuf/gdk-pixbuf-io.h>
 
 #include "utils.h"
-#include "hildon-thumbnail-plugin.h"
 
+#include <plugin/hildon-thumbnail-plugin.h>
+
 static gboolean had_init = FALSE;
 static gboolean is_active = FALSE;
 static GFileMonitor *monitor = 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-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
@@ -33,7 +33,8 @@
 #include <gst/gst.h>
 #include <gio/gio.h>
 
-#include "hildon-thumbnail-plugin.h"
+#include <plugin/hildon-thumbnail-plugin.h>
+
 #include "utils.h"
 
 #define GSTP_ERROR_DOMAIN	"HildonThumbnailerGStreamerVideoPlugin"

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-11-17 15:56:35 UTC (rev 16708)
@@ -37,7 +37,9 @@
 #include "thumbnailer.h"
 #include "thumbnailer-marshal.h"
 #include "thumbnailer-glue.h"
-#include "hildon-thumbnail-plugin.h"
+
+#include <plugin/hildon-thumbnail-plugin.h>
+
 #include "dbus-utils.h"
 #include "utils.h"
 

Modified: projects/haf/trunk/hildon-thumbnail/debian/libhildon-thumbnail-dev.install
===================================================================
--- projects/haf/trunk/hildon-thumbnail/debian/libhildon-thumbnail-dev.install	2008-11-17 15:47:03 UTC (rev 16707)
+++ projects/haf/trunk/hildon-thumbnail/debian/libhildon-thumbnail-dev.install	2008-11-17 15:56:35 UTC (rev 16708)
@@ -1,3 +1,4 @@
 usr/lib/libhildonthumbnail.so
 usr/include/hildon-thumbnail/
+usr/include/hildon-thumbnail/plugin/
 usr/lib/pkgconfig/hildon-thumbnail.pc
More information about the maemo-commits mailing list