Use the generic marshallers instead of generating them

17 files changed, 19 insertions, 167 deletions

diff --git a/.gitignore b/.gitignore
index 2117a68b..872606fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,16 +15,8 @@ Makefile.in
 *.typelib
 *.gir
 
-gst/fsrtpconference/fs-rtp-marshal.[ch]
-gst/fsrtpconference/fs-rtp-marshal.list
 gst/*/*.doc.c
 
-transmitters/rawudp/fs-rawudp-marshal.[ch]
-transmitters/rawudp/fs-rawudp-marshal.list
-
-farstream/fs-marshal.[ch]
-farstream/fs-marshal.list
-farstream/fs-enum-types.h
 farstream/fs-enumtypes.[ch]
 
 docs/libs/farstream-libs-decl-list.txt
diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak
index fbb47dc5..02c379f0 100644
--- a/common-modified/gst-glib-gen.mak
+++ b/common-modified/gst-glib-gen.mak
@@ -9,15 +9,6 @@
 enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
 
 # these are all the rules generating the relevant files
-$(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
-	$(AM_V_GEN)glib-genmarshal --header --prefix=$(glib_gen_prefix)_marshal $^ > $(glib_gen_basename)-marshal.h.tmp && \
-	mv $(glib_gen_basename)-marshal.h.tmp $(glib_gen_basename)-marshal.h
-
-$(glib_gen_basename)-marshal.c: $(glib_gen_basename)-marshal.list
-	$(AM_V_GEN)echo "#include \"$(glib_gen_basename)-marshal.h\"" >> $(glib_gen_basename)-marshal.c.tmp && \
-	glib-genmarshal --body --prefix=$(glib_gen_prefix)_marshal $^ >> $(glib_gen_basename)-marshal.c.tmp && \
-	mv $(glib_gen_basename)-marshal.c.tmp $(glib_gen_basename)-marshal.c
-
 $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)
 	$(AM_V_GEN)glib-mkenums \
 	--fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
@@ -38,8 +29,5 @@ $(glib_gen_basename)-enumtypes.c: $(glib_enum_headers)
 
 # a hack rule to make sure .Plo files exist because they get include'd
 # from Makefile's
-.deps/%-marshal.Plo:
-	@touch $@
-
 .deps/%-enumtypes.Plo:
 	@touch $@
diff --git a/configure.ac b/configure.ac
index e10fd7fe..ae9f92c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -310,7 +310,7 @@ AC_SUBST(FS_LT_LDFLAGS)
 
 dnl FS_INTERNAL_CFLAGS
 dnl prefer internal headers to already installed ones
-dnl also add builddir include for enumtypes and marshal
+dnl also add builddir include for enumtypes
 FS_INTERNAL_CFLAGS="-I\$(top_srcdir) -I\$(top_builddir)"
 AC_SUBST(FS_INTERNAL_CFLAGS)
 
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 57887f6f..106b8f09 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -49,7 +49,7 @@ SCANOBJ_DEPS = \
 	$(top_builddir)/farstream/libfarstream-@FS_APIVERSION@.la
 
 # Header files to ignore when scanning.
-IGNORE_HFILES = fs-marshal.h fs-enumtypes.h fs-private.h
+IGNORE_HFILES = fs-enumtypes.h fs-private.h
 
 # Images to copy into HTML directory.
 HTML_IMAGES =
diff --git a/farstream/Makefile.am b/farstream/Makefile.am
index 8be9167d..f7ee2a3b 100644
--- a/farstream/Makefile.am
+++ b/farstream/Makefile.am
@@ -24,7 +24,7 @@ BUILT_SOURCES = \
 	$(nodist_libfarstream_@FS_APIVERSION@_la_SOURCES) \
 	$(nodist_libfarstreaminclude_HEADERS)
 
-CLEANFILES = $(BUILT_SOURCES) fs-marshal.list
+CLEANFILES = $(BUILT_SOURCES)
 
 libfarstream_@FS_APIVERSION@_la_SOURCES = \
 		fs-candidate.c \
@@ -42,23 +42,9 @@ libfarstream_@FS_APIVERSION@_la_SOURCES = \
 		fs-private.h
 
 nodist_libfarstream_@FS_APIVERSION@_la_SOURCES = \
-		fs-marshal.c \
-		fs-marshal.h \
 		fs-enumtypes.c
 
 
-fs-marshal.list: $(libfarstream_@FS_APIVERSION@_la_SOURCES) Makefile.am
-	$(AM_V_GEN) ( cd $(srcdir) && \
-	sed -n -e 's/.*_fs_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(libfarstream_@FS_APIVERSION@_la_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	@if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-		touch $@; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
 libfarstream_@FS_APIVERSION@_la_CFLAGS = \
 	$(FS_INTERNAL_CFLAGS) $(FS_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
diff --git a/farstream/fs-element-added-notifier.c b/farstream/fs-element-added-notifier.c
index 13ddf25d..e43da767 100644
--- a/farstream/fs-element-added-notifier.c
+++ b/farstream/fs-element-added-notifier.c
@@ -42,9 +42,6 @@
 
 #include "fs-utils.h"
 
-#include "fs-marshal.h"
-
-
 /* Signals */
 enum
 {
@@ -94,10 +91,7 @@ fs_element_added_notifier_class_init (FsElementAddedNotifierClass *klass)
   signals[ELEMENT_ADDED] = g_signal_new ("element-added",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_marshal_VOID__OBJECT_OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, GST_TYPE_BIN, GST_TYPE_ELEMENT);
 
   g_type_class_add_private (klass, sizeof (FsElementAddedNotifierPrivate));
diff --git a/farstream/fs-participant.c b/farstream/fs-participant.c
index 755ce9aa..e6dd7c22 100644
--- a/farstream/fs-participant.c
+++ b/farstream/fs-participant.c
@@ -38,7 +38,6 @@
 
 #include "fs-participant.h"
 #include "fs-enumtypes.h"
-#include "fs-marshal.h"
 
 /* Signals */
 enum
diff --git a/farstream/fs-session.c b/farstream/fs-session.c
index 1e9b9e42..f6cc23a7 100644
--- a/farstream/fs-session.c
+++ b/farstream/fs-session.c
@@ -145,7 +145,6 @@
 
 #include "fs-conference.h"
 #include "fs-codec.h"
-#include "fs-marshal.h"
 #include "fs-enumtypes.h"
 #include "fs-private.h"
 
@@ -403,10 +402,7 @@ fs_session_class_init (FsSessionClass *klass)
   signals[ERROR_SIGNAL] = g_signal_new ("error",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_marshal_VOID__OBJECT_ENUM_STRING,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 3, G_TYPE_OBJECT, FS_TYPE_ERROR, G_TYPE_STRING);
 }
 
diff --git a/farstream/fs-stream-transmitter.c b/farstream/fs-stream-transmitter.c
index ac187f63..d469b355 100644
--- a/farstream/fs-stream-transmitter.c
+++ b/farstream/fs-stream-transmitter.c
@@ -42,7 +42,6 @@
 
 #include <gst/gst.h>
 
-#include "fs-marshal.h"
 #include "fs-conference.h"
 #include "fs-private.h"
 
@@ -161,10 +160,7 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
   signals[ERROR_SIGNAL] = g_signal_new ("error",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_marshal_VOID__ENUM_STRING,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, FS_TYPE_ERROR, G_TYPE_STRING);
 
     /**
@@ -184,10 +180,7 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
     ("new-active-candidate-pair",
         G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST,
-        0,
-        NULL,
-        NULL,
-        _fs_marshal_VOID__BOXED_BOXED,
+        0, NULL, NULL, NULL,
         G_TYPE_NONE, 2, FS_TYPE_CANDIDATE, FS_TYPE_CANDIDATE);
 
  /**
@@ -239,10 +232,7 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
     ("known-source-packet-received",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_marshal_VOID__UINT_POINTER,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_POINTER);
 
 
@@ -259,10 +249,7 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
     ("state-changed",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_marshal_VOID__UINT_ENUM,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_UINT, FS_TYPE_STREAM_STATE);
 
 
diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c
index 3034300c..cde69c25 100644
--- a/farstream/fs-stream.c
+++ b/farstream/fs-stream.c
@@ -105,7 +105,6 @@
 #include <gst/gst.h>
 
 #include "fs-session.h"
-#include "fs-marshal.h"
 #include "fs-codec.h"
 #include "fs-candidate.h"
 #include "fs-stream-transmitter.h"
@@ -298,10 +297,7 @@ fs_stream_class_init (FsStreamClass *klass)
   signals[ERROR_SIGNAL] = g_signal_new ("error",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_marshal_VOID__ENUM_STRING,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, FS_TYPE_ERROR, G_TYPE_STRING);
 
   /**
@@ -323,10 +319,7 @@ fs_stream_class_init (FsStreamClass *klass)
   signals[SRC_PAD_ADDED] = g_signal_new ("src-pad-added",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_marshal_VOID__BOXED_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, GST_TYPE_PAD, FS_TYPE_CODEC);
 
   g_type_class_add_private (klass, sizeof (FsStreamPrivate));
diff --git a/farstream/fs-transmitter.c b/farstream/fs-transmitter.c
index ef9b5eab..9552053d 100644
--- a/farstream/fs-transmitter.c
+++ b/farstream/fs-transmitter.c
@@ -42,7 +42,6 @@
 
 #include <gst/gst.h>
 
-#include "fs-marshal.h"
 #include "fs-plugin.h"
 #include "fs-conference.h"
 #include "fs-private.h"
@@ -193,9 +192,7 @@ fs_transmitter_class_init (FsTransmitterClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL,
-      NULL,
-      _fs_marshal_VOID__ENUM_STRING,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 2, FS_TYPE_ERROR, G_TYPE_STRING);
 
   /**
@@ -217,10 +214,7 @@ fs_transmitter_class_init (FsTransmitterClass *klass)
   signals[GET_RECVONLY_FILTER_SIGNAL] = g_signal_new ("get-recvonly-filter",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_marshal_OBJECT__UINT,
+      0, NULL, NULL, NULL,
       GST_TYPE_ELEMENT, 1, G_TYPE_UINT);
 
 
diff --git a/gst/fsrtcpfilter/Makefile.am b/gst/fsrtcpfilter/Makefile.am
index 6dacb2e5..96d1a403 100644
--- a/gst/fsrtcpfilter/Makefile.am
+++ b/gst/fsrtcpfilter/Makefile.am
@@ -16,17 +16,3 @@ libfsrtcpfilter_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_LIBS)
-
-
-
-fs-rtcp-filter-marshal.list: $(libfsrtcpfilter_la_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*fs_rtcp-filter_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(libfsrtcpfilter_la_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	@if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-		touch $@; \
-	else \
-		mv $@.tmp $@; \
-	fi
diff --git a/gst/fsrtpconference/Makefile.am b/gst/fsrtpconference/Makefile.am
index e605c19f..fbf9348e 100644
--- a/gst/fsrtpconference/Makefile.am
+++ b/gst/fsrtpconference/Makefile.am
@@ -24,12 +24,6 @@ libfsrtpconference_convenience_la_SOURCES = \
 	fs-rtp-packet-modder.c \
 	tfrc.c
 
-nodist_libfsrtpconference_convenience_la_SOURCES = \
-	fs-rtp-marshal.c \
-	fs-rtp-marshal.h
-
-BUILT_SOURCES = $(nodist_libfsrtpconference_convenience_la_SOURCES)
-
 noinst_HEADERS = \
 	fs-rtp-conference.h \
 	fs-rtp-participant.h \
@@ -50,8 +44,6 @@ noinst_HEADERS = \
 	fs-rtp-packet-modder.h \
 	tfrc.h
 
-CLEANFILES = $(BUILT_SOURCES) fs-rtp-marshal.list
-
 AM_CFLAGS = \
 	$(FS_INTERNAL_CFLAGS) \
 	$(FS_CFLAGS) \
@@ -95,17 +87,6 @@ endif
 
 # Build the build sources
 
-fs-rtp-marshal.list: $(libfsrtpconference_convenience_la_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*fs_rtp_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(libfsrtpconference_convenience_la_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	@if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-		touch $@; \
-	else \
-		mv $@.tmp $@; \
-	fi
 
 glib_enum_define=FS_RTP
 glib_gen_prefix=_fs_rtp
diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c
index cd90dd77..88cd5586 100644
--- a/gst/fsrtpconference/fs-rtp-stream.c
+++ b/gst/fsrtpconference/fs-rtp-stream.c
@@ -41,8 +41,6 @@
 
 #include <farstream/fs-rtp.h>
 
-#include "fs-rtp-marshal.h"
-
 /* Signals */
 enum
 {
diff --git a/gst/fsrtpconference/fs-rtp-substream.c b/gst/fsrtpconference/fs-rtp-substream.c
index a1b21490..c6768cfc 100644
--- a/gst/fsrtpconference/fs-rtp-substream.c
+++ b/gst/fsrtpconference/fs-rtp-substream.c
@@ -33,7 +33,6 @@
 #include <farstream/fs-session.h>
 
 #include "fs-rtp-stream.h"
-#include "fs-rtp-marshal.h"
 
 
 #define GST_CAT_DEFAULT fsrtpconference_debug
@@ -326,10 +325,7 @@ fs_rtp_sub_stream_class_init (FsRtpSubStreamClass *klass)
   signals[SRC_PAD_ADDED] = g_signal_new ("src-pad-added",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_rtp_marshal_VOID__BOXED_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, GST_TYPE_PAD, FS_TYPE_CODEC);
 
   /**
@@ -345,10 +341,7 @@ fs_rtp_sub_stream_class_init (FsRtpSubStreamClass *klass)
   signals[ERROR_SIGNAL] = g_signal_new ("error",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_rtp_marshal_VOID__INT_STRING_STRING,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
 
  /**
@@ -387,10 +380,7 @@ fs_rtp_sub_stream_class_init (FsRtpSubStreamClass *klass)
   signals[GET_CODEC_BIN] = g_signal_new ("get-codec-bin",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_rtp_marshal_POINTER__POINTER_POINTER_UINT_POINTER_POINTER,
+      0, NULL, NULL, NULL,
       G_TYPE_POINTER, 5, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_UINT,
       G_TYPE_POINTER, G_TYPE_POINTER);
 
diff --git a/transmitters/rawudp/Makefile.am b/transmitters/rawudp/Makefile.am
index 1d735e83..5fb562ac 100644
--- a/transmitters/rawudp/Makefile.am
+++ b/transmitters/rawudp/Makefile.am
@@ -9,10 +9,6 @@ librawudp_transmitter_la_SOURCES = \
 	fs-rawudp-stream-transmitter.c \
 	fs-rawudp-component.c
 
-nodist_librawudp_transmitter_la_SOURCES = \
-	fs-rawudp-marshal.c \
-	fs-rawudp-marshal.h
-
 
 # flags used to compile this plugin
 librawudp_transmitter_la_CFLAGS = \
@@ -38,23 +34,6 @@ noinst_HEADERS = \
 	fs-rawudp-stream-transmitter.h \
 	fs-rawudp-component.h
 
-BUILT_SOURCES = $(nodist_librawudp_transmitter_la_SOURCES)
-
-CLEANFILES = $(BUILT_SOURCES) fs-rawudp-marshal.list
-
-
-fs-rawudp-marshal.list: $(librawudp_transmitter_la_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*_fs_rawudp_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(librawudp_transmitter_la_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	@if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-		touch $@; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
 glib_enum_define=FS_RAWUDP
 glib_gen_prefix=_fs_rawudp
 glib_gen_basename=fs-rawudp
diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c
index 18cf82c1..64ce8fb9 100644
--- a/transmitters/rawudp/fs-rawudp-component.c
+++ b/transmitters/rawudp/fs-rawudp-component.c
@@ -29,8 +29,6 @@
 
 #include "fs-rawudp-component.h"
 
-#include "fs-rawudp-marshal.h"
-
 #include <stun/usages/bind.h>
 #include <stun/stunagent.h>
 #include <stun/usages/timer.h>
@@ -456,10 +454,7 @@ fs_rawudp_component_class_init (FsRawUdpComponentClass *klass)
     ("new-active-candidate-pair",
         G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST,
-        0,
-        NULL,
-        NULL,
-        _fs_rawudp_marshal_VOID__BOXED_BOXED,
+        0, NULL, NULL, NULL,
         G_TYPE_NONE, 2, FS_TYPE_CANDIDATE, FS_TYPE_CANDIDATE);
 
  /**
@@ -476,10 +471,7 @@ fs_rawudp_component_class_init (FsRawUdpComponentClass *klass)
     ("known-source-packet-received",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_rawudp_marshal_VOID__UINT_POINTER,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_POINTER);
 
   /**
@@ -494,10 +486,7 @@ fs_rawudp_component_class_init (FsRawUdpComponentClass *klass)
   signals[ERROR_SIGNAL] = g_signal_new ("error",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0,
-      NULL,
-      NULL,
-      _fs_rawudp_marshal_VOID__ENUM_STRING,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 2, FS_TYPE_ERROR, G_TYPE_STRING);