From a2d3231ec76c096fe11db91f9a6db92885442aec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Wed, 3 Feb 2016 21:13:58 +0000
Subject: debugutils: use generic marshaller

---
 gst/debugutils/.gitignore              |  2 --
 gst/debugutils/Makefile.am             | 15 ---------------
 gst/debugutils/debugutils-marshal.list |  2 --
 gst/debugutils/fpsdisplaysink.c        |  4 +---
 4 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 gst/debugutils/.gitignore
 delete mode 100644 gst/debugutils/debugutils-marshal.list

(limited to 'gst/debugutils')

diff --git a/gst/debugutils/.gitignore b/gst/debugutils/.gitignore
deleted file mode 100644
index 69e91a92c..000000000
--- a/gst/debugutils/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-debugutils-marshal.c
-debugutils-marshal.h
diff --git a/gst/debugutils/Makefile.am b/gst/debugutils/Makefile.am
index aff78a24d..783a9cefd 100644
--- a/gst/debugutils/Makefile.am
+++ b/gst/debugutils/Makefile.am
@@ -1,17 +1,3 @@
-glib_gen_prefix = __gst_debugutils
-glib_gen_basename = debugutils
-
-include $(top_srcdir)/common/gst-glib-gen.mak
-
-built_sources = debugutils-marshal.c
-built_headers = debugutils-marshal.h
-
-BUILT_SOURCES = $(built_sources) $(built_headers)
-
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = debugutils-marshal.list
-
 plugin_LTLIBRARIES = libgstdebugutilsbad.la
 
 libgstdebugutilsbad_la_SOURCES = \
@@ -24,7 +10,6 @@ libgstdebugutilsbad_la_SOURCES = \
 	gstwatchdog.c \
 	gsterrorignore.c
 
-nodist_libgstdebugutilsbad_la_SOURCES = $(BUILT_SOURCES)
 libgstdebugutilsbad_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
 libgstdebugutilsbad_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
 	-lgstvideo-$(GST_API_VERSION) \
diff --git a/gst/debugutils/debugutils-marshal.list b/gst/debugutils/debugutils-marshal.list
deleted file mode 100644
index 8073fd3fe..000000000
--- a/gst/debugutils/debugutils-marshal.list
+++ /dev/null
@@ -1,2 +0,0 @@
-VOID:DOUBLE,DOUBLE,DOUBLE
-
diff --git a/gst/debugutils/fpsdisplaysink.c b/gst/debugutils/fpsdisplaysink.c
index 39c2422e7..4a01aa99f 100644
--- a/gst/debugutils/fpsdisplaysink.c
+++ b/gst/debugutils/fpsdisplaysink.c
@@ -47,7 +47,6 @@
 #include "config.h"
 #endif
 
-#include "debugutils-marshal.h"
 #include "fpsdisplaysink.h"
 
 #define DEFAULT_SIGNAL_FPS_MEASUREMENTS FALSE
@@ -203,8 +202,7 @@ fps_display_sink_class_init (GstFPSDisplaySinkClass * klass)
    */
   fpsdisplaysink_signals[SIGNAL_FPS_MEASUREMENTS] =
       g_signal_new ("fps-measurements", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      __gst_debugutils_marshal_VOID__DOUBLE_DOUBLE_DOUBLE,
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
       G_TYPE_NONE, 3, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_DOUBLE);
 
   gstelement_klass->change_state = fps_display_sink_change_state;
-- 
cgit v1.2.1