diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2016-02-03 21:13:58 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2016-02-03 21:13:58 +0000 |
| commit | a2d3231ec76c096fe11db91f9a6db92885442aec (patch) | |
| tree | 7a5b9d2072a3a178b6fbbee7d08d670c12574bea /gst/debugutils | |
| parent | 730d92ea8db364f2ac175089854e7f0cba572699 (diff) | |
| download | gstreamer-plugins-bad-a2d3231ec76c096fe11db91f9a6db92885442aec.tar.gz | |
debugutils: use generic marshaller
Diffstat (limited to 'gst/debugutils')
| -rw-r--r-- | gst/debugutils/.gitignore | 2 | ||||
| -rw-r--r-- | gst/debugutils/Makefile.am | 15 | ||||
| -rw-r--r-- | gst/debugutils/debugutils-marshal.list | 2 | ||||
| -rw-r--r-- | gst/debugutils/fpsdisplaysink.c | 4 |
4 files changed, 1 insertions, 22 deletions
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; |