Use the generic marshallers instead of generating them

7 files changed, 11 insertions, 62 deletions

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);