[maemo-commits] [maemo-commits] r18507 - in projects/haf/trunk/hildon-thumbnail: . daemon thumbnailers/gst-video-thumbnailer
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed May 27 16:25:58 EEST 2009
- Previous message: [maemo-commits] r18506 - in projects/haf/trunk/clutter0.8: clutter clutter/cogl/gles debian
- Next message: [maemo-commits] r18508 - projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: pvanhoof Date: 2009-05-27 16:25:45 +0300 (Wed, 27 May 2009) New Revision: 18507 Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog projects/haf/trunk/hildon-thumbnail/configure.ac projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/Makefile.am projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/gst-video-thumbnailer-glue.h Log: 2009-05-27 Mikael Ottela <mikael.ottela at ixonos.com> * thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c: A postfix fix * thumbnailers/gst-video-thumbnailer/Makefile.am * configure.ac: Fix the path that gets substituted into the service file. * daemon/thumbnailer.c: Crash fix to specialized thumbnailers timeout. Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog =================================================================== --- projects/haf/trunk/hildon-thumbnail/ChangeLog 2009-05-27 11:29:45 UTC (rev 18506) +++ projects/haf/trunk/hildon-thumbnail/ChangeLog 2009-05-27 13:25:45 UTC (rev 18507) @@ -1,3 +1,11 @@ +2009-05-27 Mikael Ottela <mikael.ottela at ixonos.com> + + * thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c: A postfix fix + * thumbnailers/gst-video-thumbnailer/Makefile.am + * configure.ac: Fix the path that gets substituted into the + service file. + * daemon/thumbnailer.c: Crash fix to specialized thumbnailers timeout. + 2009-05-27 Philip Van Hoof <philip at codeminded.be> * Bugfix for a crash reported by mail Modified: projects/haf/trunk/hildon-thumbnail/configure.ac =================================================================== --- projects/haf/trunk/hildon-thumbnail/configure.ac 2009-05-27 11:29:45 UTC (rev 18506) +++ projects/haf/trunk/hildon-thumbnail/configure.ac 2009-05-27 13:25:45 UTC (rev 18507) @@ -267,5 +267,4 @@ albumart-providers/googleimages/Makefile \ thumbnailers/Makefile \ thumbnailers/gst-video-thumbnailer/Makefile \ - thumbnailers/gst-video-thumbnailer/com.nokia.thumbnailer.Gstreamer.service \ hildon-thumbnail.pc) Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c 2009-05-27 11:29:45 UTC (rev 18506) +++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c 2009-05-27 13:25:45 UTC (rev 18507) @@ -700,6 +700,7 @@ info.mutex = g_mutex_new (); info.uri = urlss[o]; info.mime_type = mime_type; + info.error_msg = NULL; dbus_g_proxy_connect_signal (proxy, "Ready", G_CALLBACK (specialized_ready), Modified: projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/Makefile.am =================================================================== --- projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/Makefile.am 2009-05-27 11:29:45 UTC (rev 18506) +++ projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/Makefile.am 2009-05-27 13:25:45 UTC (rev 18507) @@ -22,10 +22,9 @@ EXTRA_DIST = \ gst-thumb-main.c \ gst-thumb-thumber.c \ - gst-thumb-pipe.c + gst-thumb-pipe.c \ + $(com.nokia.thumbnailer.Gstreamer_service_DATA) -CLEANFILES = $(com.nokia.Thumbnailer_service_DATA) - if HAVE_GSTREAMER libexec_PROGRAMS = gst-video-thumbnailerd endif @@ -69,3 +68,5 @@ $(GDK_PIXBUF_LIBS) \ $(PLAYBACK_LIBS) +CLEANFILES = $(BUILT_SOURCES) \ + $(com.nokia.thumbnailer.Gstreamer_service_DATA) Modified: projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c 2009-05-27 11:29:45 UTC (rev 18506) +++ projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c 2009-05-27 13:25:45 UTC (rev 18507) @@ -714,7 +714,7 @@ checksum = compute_checksum (G_CHECKSUM_MD5, (const guchar *)uri, strlen (uri)); png_name = g_strdup_printf ("%s.png", checksum); - jpg_name = g_strdup_printf ("%s.jpg", checksum); + jpg_name = g_strdup_printf ("%s.jpeg", checksum); g_free (checksum); Modified: projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/gst-video-thumbnailer-glue.h =================================================================== --- projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/gst-video-thumbnailer-glue.h 2009-05-27 11:29:45 UTC (rev 18506) +++ projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer/gst-video-thumbnailer-glue.h 2009-05-27 13:25:45 UTC (rev 18507) @@ -53,27 +53,27 @@ #endif /* !G_ENABLE_DEBUG */ -/* NONE:BOXED,STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.7AOTTU:1) */ -extern void dbus_glib_marshal_gst_video_thumbnailer_VOID__BOXED_STRING_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); +/* NONE:STRING,STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.NLS3TU:1) */ +extern void dbus_glib_marshal_gst_video_thumbnailer_VOID__STRING_STRING_POINTER (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); void -dbus_glib_marshal_gst_video_thumbnailer_VOID__BOXED_STRING_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) +dbus_glib_marshal_gst_video_thumbnailer_VOID__STRING_STRING_POINTER (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__BOXED_STRING_POINTER) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer arg_3, - gpointer data2); - register GMarshalFunc_VOID__BOXED_STRING_POINTER callback; + typedef void (*GMarshalFunc_VOID__STRING_STRING_POINTER) (gpointer data1, + gpointer arg_1, + gpointer arg_2, + gpointer arg_3, + gpointer data2); + register GMarshalFunc_VOID__STRING_STRING_POINTER callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; @@ -89,37 +89,37 @@ data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } - callback = (GMarshalFunc_VOID__BOXED_STRING_POINTER) (marshal_data ? marshal_data : cc->callback); + callback = (GMarshalFunc_VOID__STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback); callback (data1, - g_marshal_value_peek_boxed (param_values + 1), + g_marshal_value_peek_string (param_values + 1), g_marshal_value_peek_string (param_values + 2), g_marshal_value_peek_pointer (param_values + 3), data2); } -#define dbus_glib_marshal_gst_video_thumbnailer_NONE__BOXED_STRING_POINTER dbus_glib_marshal_gst_video_thumbnailer_VOID__BOXED_STRING_POINTER +#define dbus_glib_marshal_gst_video_thumbnailer_NONE__STRING_STRING_POINTER dbus_glib_marshal_gst_video_thumbnailer_VOID__STRING_STRING_POINTER -/* NONE:STRING,STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.7AOTTU:2) */ -extern void dbus_glib_marshal_gst_video_thumbnailer_VOID__STRING_STRING_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); +/* NONE:BOXED,STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.NLS3TU:2) */ +extern void dbus_glib_marshal_gst_video_thumbnailer_VOID__BOXED_STRING_POINTER (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); void -dbus_glib_marshal_gst_video_thumbnailer_VOID__STRING_STRING_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) +dbus_glib_marshal_gst_video_thumbnailer_VOID__BOXED_STRING_POINTER (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__STRING_STRING_POINTER) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer arg_3, - gpointer data2); - register GMarshalFunc_VOID__STRING_STRING_POINTER callback; + typedef void (*GMarshalFunc_VOID__BOXED_STRING_POINTER) (gpointer data1, + gpointer arg_1, + gpointer arg_2, + gpointer arg_3, + gpointer data2); + register GMarshalFunc_VOID__BOXED_STRING_POINTER callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; @@ -135,15 +135,15 @@ data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } - callback = (GMarshalFunc_VOID__STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback); + callback = (GMarshalFunc_VOID__BOXED_STRING_POINTER) (marshal_data ? marshal_data : cc->callback); callback (data1, - g_marshal_value_peek_string (param_values + 1), + g_marshal_value_peek_boxed (param_values + 1), g_marshal_value_peek_string (param_values + 2), g_marshal_value_peek_pointer (param_values + 3), data2); } -#define dbus_glib_marshal_gst_video_thumbnailer_NONE__STRING_STRING_POINTER dbus_glib_marshal_gst_video_thumbnailer_VOID__STRING_STRING_POINTER +#define dbus_glib_marshal_gst_video_thumbnailer_NONE__BOXED_STRING_POINTER dbus_glib_marshal_gst_video_thumbnailer_VOID__BOXED_STRING_POINTER G_END_DECLS
- Previous message: [maemo-commits] r18506 - in projects/haf/trunk/clutter0.8: clutter clutter/cogl/gles debian
- Next message: [maemo-commits] r18508 - projects/haf/trunk/hildon-thumbnail/thumbnailers/gst-video-thumbnailer
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]