diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2013-02-05 17:25:41 +0100 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2013-02-05 17:25:41 +0100 |
| commit | f4727622b206f534bf6e6c1a1711d3df9c2e19ec (patch) | |
| tree | 05967da120179539dff761aad7b2e305e991e94e /transmitters | |
| parent | 8c05863f85469223192409f7852b2ce19f44fdfc (diff) | |
| download | farstream-f4727622b206f534bf6e6c1a1711d3df9c2e19ec.tar.gz | |
Use the generic marshallers instead of generating them
Diffstat (limited to 'transmitters')
| -rw-r--r-- | transmitters/rawudp/Makefile.am | 21 | ||||
| -rw-r--r-- | transmitters/rawudp/fs-rawudp-component.c | 17 |
2 files changed, 3 insertions, 35 deletions
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); |