From 452b38560c1335ef9bee666fe7aa84e582d3bdbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Sat, 4 Aug 2012 23:09:06 +0100
Subject: [PATCH] encodebin: use generic marshaller for signal

---
 gst/encoding/.gitignore             |  1 -
 gst/encoding/Makefile.am            | 18 +-----------------
 gst/encoding/gstencode-marshal.list |  1 -
 gst/encoding/gstencodebin.c         |  2 +-
 gst/encoding/gstencodebin.h         |  1 -
 5 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 gst/encoding/.gitignore
 delete mode 100644 gst/encoding/gstencode-marshal.list

diff --git a/gst/encoding/.gitignore b/gst/encoding/.gitignore
deleted file mode 100644
index ff44545891..0000000000
--- a/gst/encoding/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gstencode-marshal.[ch]
diff --git a/gst/encoding/Makefile.am b/gst/encoding/Makefile.am
index 4849e689d6..f1b4e5fa91 100644
--- a/gst/encoding/Makefile.am
+++ b/gst/encoding/Makefile.am
@@ -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
 
 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 \
diff --git a/gst/encoding/gstencode-marshal.list b/gst/encoding/gstencode-marshal.list
deleted file mode 100644
index 00f26ed2bc..0000000000
--- a/gst/encoding/gstencode-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-OBJECT:BOXED
diff --git a/gst/encoding/gstencodebin.c b/gst/encoding/gstencodebin.c
index 749cf239e5..3399dbad57 100644
--- a/gst/encoding/gstencodebin.c
+++ b/gst/encoding/gstencodebin.c
@@ -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;
diff --git a/gst/encoding/gstencodebin.h b/gst/encoding/gstencodebin.h
index 2d594b0f6d..58383d6dfd 100644
--- a/gst/encoding/gstencodebin.h
+++ b/gst/encoding/gstencodebin.h
@@ -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))