From 75f3c7cb8562129dfdb4ee432d40541483070b01 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 15 May 2016 14:37:41 +0100 Subject: [PATCH] app: use generic marshallers --- gst-libs/gst/app/Makefile.am | 14 +------------- gst-libs/gst/app/gstappsink.c | 13 ++++--------- gst-libs/gst/app/gstappsrc.c | 12 +++++------- 3 files changed, 10 insertions(+), 29 deletions(-) diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am index 1555841..ec413a4 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am @@ -6,14 +6,6 @@ glib_gen_basename = gstapp include $(top_srcdir)/common/gst-glib-gen.mak -built_sources = gstapp-marshal.c -built_headers = gstapp-marshal.h - -BUILT_SOURCES = $(built_sources) $(built_headers) - -nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = \ - $(built_sources) - libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) @@ -26,10 +18,6 @@ libgstapp_@GST_API_VERSION@include_HEADERS = \ gstappsrc.h \ gstappsink.h -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = gstapp-marshal.list - if HAVE_INTROSPECTION BUILT_GIRSOURCES = GstApp-@GST_API_VERSION@.gir @@ -80,5 +68,5 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) -CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) +CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) endif diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c index 9a96341..eca5008 100644 --- a/gst-libs/gst/app/gstappsink.c +++ b/gst-libs/gst/app/gstappsink.c @@ -69,7 +69,6 @@ #include -#include "gstapp-marshal.h" #include "gstappsink.h" struct _GstAppSinkPrivate @@ -259,8 +258,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass) gst_app_sink_signals[SIGNAL_NEW_PREROLL] = g_signal_new ("new-preroll", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstAppSinkClass, new_preroll), - NULL, NULL, __gst_app_marshal_ENUM__VOID, GST_TYPE_FLOW_RETURN, 0, - G_TYPE_NONE); + NULL, NULL, NULL, GST_TYPE_FLOW_RETURN, 0, G_TYPE_NONE); /** * GstAppSink::new-sample: * @appsink: the appsink element that emited the signal @@ -280,8 +278,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass) gst_app_sink_signals[SIGNAL_NEW_SAMPLE] = g_signal_new ("new-sample", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstAppSinkClass, new_sample), - NULL, NULL, __gst_app_marshal_ENUM__VOID, GST_TYPE_FLOW_RETURN, 0, - G_TYPE_NONE); + NULL, NULL, NULL, GST_TYPE_FLOW_RETURN, 0, G_TYPE_NONE); /** * GstAppSink::pull-preroll: @@ -309,8 +306,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass) gst_app_sink_signals[SIGNAL_PULL_PREROLL] = g_signal_new ("pull-preroll", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSinkClass, - pull_preroll), NULL, NULL, __gst_app_marshal_BOXED__VOID, - GST_TYPE_SAMPLE, 0, G_TYPE_NONE); + pull_preroll), NULL, NULL, NULL, GST_TYPE_SAMPLE, 0, G_TYPE_NONE); /** * GstAppSink::pull-sample: * @appsink: the appsink element to emit this signal on @@ -335,8 +331,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass) gst_app_sink_signals[SIGNAL_PULL_SAMPLE] = g_signal_new ("pull-sample", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSinkClass, - pull_sample), NULL, NULL, __gst_app_marshal_BOXED__VOID, - GST_TYPE_SAMPLE, 0, G_TYPE_NONE); + pull_sample), NULL, NULL, NULL, GST_TYPE_SAMPLE, 0, G_TYPE_NONE); gst_element_class_set_static_metadata (element_class, "AppSink", "Generic/Sink", "Allow the application to get access to raw buffer", diff --git a/gst-libs/gst/app/gstappsrc.c b/gst-libs/gst/app/gstappsrc.c index 4804032..026a770 100644 --- a/gst-libs/gst/app/gstappsrc.c +++ b/gst-libs/gst/app/gstappsrc.c @@ -98,7 +98,6 @@ #include -#include "gstapp-marshal.h" #include "gstappsrc.h" struct _GstAppSrcPrivate @@ -436,7 +435,7 @@ gst_app_src_class_init (GstAppSrcClass * klass) gst_app_src_signals[SIGNAL_NEED_DATA] = g_signal_new ("need-data", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstAppSrcClass, need_data), - NULL, NULL, __gst_app_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT); /** * GstAppSrc::enough-data: @@ -465,8 +464,7 @@ gst_app_src_class_init (GstAppSrcClass * klass) gst_app_src_signals[SIGNAL_SEEK_DATA] = g_signal_new ("seek-data", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstAppSrcClass, seek_data), - NULL, NULL, __gst_app_marshal_BOOLEAN__UINT64, G_TYPE_BOOLEAN, 1, - G_TYPE_UINT64); + NULL, NULL, NULL, G_TYPE_BOOLEAN, 1, G_TYPE_UINT64); /** * GstAppSrc::push-buffer: @@ -483,7 +481,7 @@ gst_app_src_class_init (GstAppSrcClass * klass) gst_app_src_signals[SIGNAL_PUSH_BUFFER] = g_signal_new ("push-buffer", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSrcClass, - push_buffer), NULL, NULL, __gst_app_marshal_ENUM__BOXED, + push_buffer), NULL, NULL, NULL, GST_TYPE_FLOW_RETURN, 1, GST_TYPE_BUFFER); /** @@ -509,7 +507,7 @@ gst_app_src_class_init (GstAppSrcClass * klass) gst_app_src_signals[SIGNAL_PUSH_SAMPLE] = g_signal_new ("push-sample", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSrcClass, - push_sample), NULL, NULL, __gst_app_marshal_ENUM__BOXED, + push_sample), NULL, NULL, NULL, GST_TYPE_FLOW_RETURN, 1, GST_TYPE_SAMPLE); @@ -522,7 +520,7 @@ gst_app_src_class_init (GstAppSrcClass * klass) gst_app_src_signals[SIGNAL_END_OF_STREAM] = g_signal_new ("end-of-stream", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSrcClass, - end_of_stream), NULL, NULL, __gst_app_marshal_ENUM__VOID, + end_of_stream), NULL, NULL, NULL, GST_TYPE_FLOW_RETURN, 0, G_TYPE_NONE); gst_element_class_set_static_metadata (element_class, "AppSrc", -- 2.7.4