mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

encodebin: use generic marshaller for signal

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-08-04 23:09:06 +01:00
parent 24478261a2
commit 452b38560c
5 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst/encoding/.gitignore vendored
View file

@ -1 +0,0 @@
gstencode-marshal.[ch]

18
gst/encoding/Makefile.am
View file

@ -1,11 +1,3 @@
# 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 plugin_LTLIBRARIES = libgstencodebin.la
libgstencodebin_la_SOURCES = \ libgstencodebin_la_SOURCES = \
@ -14,7 +6,6 @@ libgstencodebin_la_SOURCES = \
gststreamcombiner.c \ gststreamcombiner.c \
gststreamsplitter.c gststreamsplitter.c
nodist_libgstencodebin_la_SOURCES = $(built_sources)
libgstencodebin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstencodebin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstencodebin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstencodebin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstencodebin_la_LIBADD = \ libgstencodebin_la_LIBADD = \
@ -28,16 +19,9 @@ noinst_HEADERS = \
gststreamsplitter.h \ gststreamsplitter.h \
gstsmartencoder.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 include $(top_srcdir)/common/gst-glib-gen.mak
Android.mk: Makefile.am $(BUILT_SOURCES) Android.mk: Makefile.am
androgenizer \ androgenizer \
-:PROJECT libgstencodebin -:SHARED libgstencodebin \ -:PROJECT libgstencodebin -:SHARED libgstencodebin \
-:TAGS eng debug \ -:TAGS eng debug \

1
gst/encoding/gstencode-marshal.list
View file

@ -1 +0,0 @@
OBJECT:BOXED

2
gst/encoding/gstencodebin.c
View file

@ -400,7 +400,7 @@ gst_encode_bin_class_init (GstEncodeBinClass * klass)
gst_encode_bin_signals[SIGNAL_REQUEST_PAD] = gst_encode_bin_signals[SIGNAL_REQUEST_PAD] =
g_signal_new ("request-pad", G_TYPE_FROM_CLASS (klass), g_signal_new ("request-pad", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstEncodeBinClass, 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); GST_TYPE_PAD, 1, GST_TYPE_CAPS);
klass->request_pad = gst_encode_bin_request_pad_signal; klass->request_pad = gst_encode_bin_request_pad_signal;

1
gst/encoding/gstencodebin.h
View file

@ -23,7 +23,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/pbutils/pbutils.h> #include <gst/pbutils/pbutils.h>
#include "gstencode-marshal.h"
#define GST_TYPE_ENCODE_BIN (gst_encode_bin_get_type()) #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)) #define GST_ENCODE_BIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODE_BIN,GstEncodeBin))