libs: use generic g_cclosure_marshal_VOID__VOID().

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

diff --git a/.gitignore b/.gitignore
index 93fb38e..2cd25a5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -55,9 +55,6 @@ docs/reference/plugins/tmpl*
 docs/reference/plugins/xml*
 docs/reference/plugins/*.stamp
 gst-libs/gst/gstutils_version.h
-gst-libs/gst/vaapi/gstvaapimarshal.c
-gst-libs/gst/vaapi/gstvaapimarshal.h
-gst-libs/gst/vaapi/stamp-marshal
 gtk-doc.make
 pkgconfig/gstreamer-vaapi-0.10.pc
 pkgconfig/gstreamer-vaapi-glx-0.10.pc

diff --git a/configure.ac b/configure.ac
index d1b2244..4bef5b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -161,7 +161,6 @@ AM_CONDITIONAL([ENABLE_GTK_DOC], [false])])
 AC_SUBST(GTKDOC_VERSION)
 
 dnl Check for GLib
-AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= glib_version])
 
 dnl Check for GStreamer

diff --git a/docs/reference/libs/Makefile.am b/docs/reference/libs/Makefile.am
index f8eafeb..d4747b3 100644 (file)
--- a/docs/reference/libs/Makefile.am
+++ b/docs/reference/libs/Makefile.am
@@ -66,7 +66,6 @@ IGNORE_HFILES = \
        gstvaapidisplay_priv.h \
        gstvaapidisplay_glx_priv.h \
        gstvaapidisplay_x11_priv.h \
-       gstvaapimarshal.h \
        gstvaapiobject_priv.h \
        gstvaapiutils.h \
        gstvaapiutils_glx.h \
@@ -75,7 +74,6 @@ IGNORE_HFILES = \
        $(NULL)
 
 EXTRA_HFILES = \
-       gstvaapimarshal.c \
        $(NULL)
 
 # Images to copy into HTML directory.

diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index b269193..9c6f846 100644 (file)
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -36,7 +36,6 @@ libgstvaapi_source_c =                                \
        gstvaapiimage.c                         \
        gstvaapiimageformat.c                   \
        gstvaapiimagepool.c                     \
-       gstvaapimarshal.c                       \
        gstvaapiobject.c                        \
        gstvaapiparamspecs.c                    \
        gstvaapiprofile.c                       \
@@ -271,36 +270,3 @@ libgstvaapi_glx_@GST_MAJORMINOR@_la_LDFLAGS =      \
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = Makefile.in
-
-# glib-genmarshal rules
-glib_marshal_list = gstvaapimarshal.list
-glib_marshal_prefix = gst_vaapi_marshal
-
-marshal_h = $(glib_marshal_list:.list=.h)
-marshal_c = $(glib_marshal_list:.list=.c)
-
-CLEANFILES     = stamp-marshal
-DISTCLEANFILES = $(marshal_h) $(marshal_c)
-BUILT_SOURCES  = $(marshal_h) $(marshal_c)
-EXTRA_DIST     = $(srcdir)/$(glib_marshal_list)
-
-stamp-marshal: $(glib_marshal_list)
-       $(GLIB_GENMARSHAL) \
-               --prefix=$(glib_marshal_prefix) \
-               --header \
-       $(srcdir)/$(glib_marshal_list) > xgen-mh \
-       && (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \
-       && rm -f xgen-mh \
-       && echo timestamp > $(@F)
-
-$(marshal_h): stamp-marshal
-       @true
-
-$(marshal_c): $(marshal_h)
-       (echo "#include \"$(marshal_h)\"" ; \
-       $(GLIB_GENMARSHAL) \
-               --prefix=$(glib_marshal_prefix) \
-               --body \
-       $(srcdir)/$(glib_marshal_list)) > xgen-mc \
-       && cp xgen-mc $(marshal_c) \
-       && rm -f xgen-mc

diff --git a/gst-libs/gst/vaapi/gstvaapimarshal.list b/gst-libs/gst/vaapi/gstvaapimarshal.list
deleted file mode 100644 (file)
index 5b76282..0000000
--- a/gst-libs/gst/vaapi/gstvaapimarshal.list
+++ /dev/null
@@ -1 +0,0 @@
-VOID:VOID

diff --git a/gst-libs/gst/vaapi/gstvaapiobject.c b/gst-libs/gst/vaapi/gstvaapiobject.c
index 52529c0..ec8286e 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiobject.c
+++ b/gst-libs/gst/vaapi/gstvaapiobject.c
@@ -29,7 +29,6 @@
 #include "gstvaapi_priv.h"
 #include "gstvaapiparamspecs.h"
 #include "gstvaapivalue.h"
-#include "gstvaapimarshal.h"
 
 #define DEBUG 1
 #include "gstvaapidebug.h"
@@ -179,7 +178,7 @@ gst_vaapi_object_class_init(GstVaapiObjectClass *klass)
         G_SIGNAL_RUN_CLEANUP | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
         G_STRUCT_OFFSET(GstVaapiObjectClass, destroy),
         NULL, NULL,
-        gst_vaapi_marshal_VOID__VOID,
+        g_cclosure_marshal_VOID__VOID,
         G_TYPE_NONE, 0
     );
 }