diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-03-13 19:32:08 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-03-13 19:35:12 +0000 |
| commit | 5bc20dc242743b68d9eda29d1a65feb3428d5a53 (patch) | |
| tree | f2ccffb32090a89df169875917773678166737a5 | |
| parent | 461aa6dd107c84b0f04ee18bddc6c86269f7eceb (diff) | |
Remove gstmarshal.[ch] completely and use the generic marshaller
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | gnl/.gitignore | 2 | ||||
| -rw-r--r-- | gnl/Makefile.am | 25 | ||||
| -rw-r--r-- | gnl/gnloperation.c | 3 |
4 files changed, 5 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac index 499c576..43a2341 100644 --- a/configure.ac +++ b/configure.ac @@ -45,8 +45,8 @@ AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL dnl *** required versions of GStreamer stuff *** -GST_REQ=0.11.0 -GSTPB_REQ=0.11.0 +GST_REQ=0.11.2 +GSTPB_REQ=0.11.2 dnl *** autotools stuff **** diff --git a/gnl/.gitignore b/gnl/.gitignore index a3c70f7..f5ff8c3 100644 --- a/gnl/.gitignore +++ b/gnl/.gitignore @@ -6,5 +6,3 @@ Makefile.in .deps .libs gnlversion.h -gnlmarshal.c -gnlmarshal.h diff --git a/gnl/Makefile.am b/gnl/Makefile.am index e55204e..2847577 100644 --- a/gnl/Makefile.am +++ b/gnl/Makefile.am @@ -1,15 +1,10 @@ -built_header_make = gnlmarshal.h -built_source_make = gnlmarshal.c plugin_LTLIBRARIES = libgnl.la -EXTRA_libgnl_la_SOURCES = gnlmarshal.list - libgnl_la_SOURCES = \ gnl.c \ gnlobject.c \ gnlcomposition.c \ gnlghostpad.c \ - gnlmarshal.c \ gnloperation.c \ gnlsource.c \ gnlurisource.c @@ -32,25 +27,9 @@ gnl_headers = \ DISTCLEANFILE = $(CLEANFILES) #files built on make all/check/instal -BUILT_SOURCES = \ - $(built_header_configure) \ - $(built_header_make) \ - $(built_source_make) - -CLEANFILES = $(built_header_make) $(built_source_make) - -noinst_HEADERS = $(gnl_headers) $(built_header_make) $(built_header_configure) - -gnlmarshal.h: gnlmarshal.list - $(AM_V_GEN)glib-genmarshal --header --prefix=gnl_marshal $^ > gnlmarshal.h.tmp && \ - mv gnlmarshal.h.tmp gnlmarshal.h - -gnlmarshal.c: gnlmarshal.list - $(AM_V_GEN)echo "#include \"glib-object.h\"" >gnlmarshal.c.tmp && \ - echo "#include \"gnlmarshal.h\"" >> gnlmarshal.c.tmp && \ - glib-genmarshal --body --prefix=gnl_marshal $^ >> gnlmarshal.c.tmp && \ - mv gnlmarshal.c.tmp gnlmarshal.c +BUILT_SOURCES = $(built_header_configure) +noinst_HEADERS = $(gnl_headers) $(built_header_configure) Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ diff --git a/gnl/gnloperation.c b/gnl/gnloperation.c index e58ff72..9c12465 100644 --- a/gnl/gnloperation.c +++ b/gnl/gnloperation.c @@ -24,7 +24,6 @@ #endif #include "gnl.h" -#include "gnlmarshal.h" /** * SECTION:element-gnloperation @@ -137,7 +136,7 @@ gnl_operation_class_init (GnlOperationClass * klass) gnl_operation_signals[INPUT_PRIORITY_CHANGED] = g_signal_new ("input-priority-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GnlOperationClass, - input_priority_changed), NULL, NULL, gnl_marshal_VOID__OBJECT_UINT, + input_priority_changed), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 2, GST_TYPE_PAD, G_TYPE_UINT); gstelement_class->request_new_pad = |