Commit 452b3856 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠

encodebin: use generic marshaller for signal

parent 24478261
gstencode-marshal.[ch]
# variables used for enum/marshal generation
glib_enum_define = GST_ENCODE
glib_gen_prefix = gst_encode
glib_gen_basename = gstencode
built_sources = gstencode-marshal.c
built_headers = gstencode-marshal.h
plugin_LTLIBRARIES = libgstencodebin.la
libgstencodebin_la_SOURCES = \
......@@ -14,7 +6,6 @@ libgstencodebin_la_SOURCES = \
gststreamcombiner.c \
gststreamsplitter.c
nodist_libgstencodebin_la_SOURCES = $(built_sources)
libgstencodebin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstencodebin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstencodebin_la_LIBADD = \
......@@ -28,16 +19,9 @@ noinst_HEADERS = \
gststreamsplitter.h \
gstsmartencoder.h
BUILT_SOURCES = $(built_headers) $(built_sources)
EXTRA_DIST = gstencode-marshal.list
CLEANFILES = $(BUILT_SOURCES)
include $(top_srcdir)/common/gst-glib-gen.mak
Android.mk: Makefile.am $(BUILT_SOURCES)
Android.mk: Makefile.am
androgenizer \
-:PROJECT libgstencodebin -:SHARED libgstencodebin \
-:TAGS eng debug \
......
......@@ -400,7 +400,7 @@ gst_encode_bin_class_init (GstEncodeBinClass * klass)
gst_encode_bin_signals[SIGNAL_REQUEST_PAD] =
g_signal_new ("request-pad", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstEncodeBinClass,
request_pad), NULL, NULL, gst_encode_marshal_OBJECT__BOXED,
request_pad), NULL, NULL, g_cclosure_marshal_generic,
GST_TYPE_PAD, 1, GST_TYPE_CAPS);
klass->request_pad = gst_encode_bin_request_pad_signal;
......
......@@ -23,7 +23,6 @@
#include <gst/gst.h>
#include <gst/pbutils/pbutils.h>
#include "gstencode-marshal.h"
#define GST_TYPE_ENCODE_BIN (gst_encode_bin_get_type())
#define GST_ENCODE_BIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODE_BIN,GstEncodeBin))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment