Commit d82ca9ce authored by Olivier Crête's avatar Olivier Crête

agent: Use generic marshaller

parent 267a6767
......@@ -65,8 +65,6 @@ agent/test-fallback
agent/test-fullmode
agent/test-restart
agent/test-thread
agent/agent-signals-marshal.h
agent/agent-signals-marshal.c
# stun/ stuff
......
......@@ -22,23 +22,8 @@ if WINDOWS
AM_CFLAGS += -DWINVER=0x0501 # _WIN32_WINNT_WINXP
endif
dist_noinst_DATA = agent-signals-marshal.list
noinst_LTLIBRARIES = libagent.la
agent-signals-marshal.h: agent-signals-marshal.list
glib-genmarshal --header --prefix=agent_marshal $? > $@
agent-signals-marshal.c: agent-signals-marshal.list
echo '#include "agent-signals-marshal.h"' > $@
glib-genmarshal --body --prefix=agent_marshal $? | \
sed -e 's/^}$$/(void)return_value;(void)invocation_hint;}/' >> $@
BUILT_SOURCES = \
agent-signals-marshal.h \
agent-signals-marshal.c
CLEANFILES += $(BUILT_SOURCES)
libagent_la_SOURCES = \
address.h \
address.c \
......
# component-status-changed
VOID:UINT,UINT,UINT
# new-selected-pair
VOID:UINT,UINT,STRING,STRING
# new-candidate
VOID:UINT,UINT,STRING
# candidate-gathering-done
# initial-binding-request-received
VOID:UINT
# reliable-transport-writable
VOID:UINT,UINT
......@@ -67,7 +67,6 @@
#include "discovery.h"
#include "agent.h"
#include "agent-priv.h"
#include "agent-signals-marshal.h"
#include "iostream.h"
#include "stream.h"
......@@ -607,7 +606,7 @@ nice_agent_class_init (NiceAgentClass *klass)
0,
NULL,
NULL,
agent_marshal_VOID__UINT_UINT_UINT,
NULL,
G_TYPE_NONE,
3,
G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT,
......@@ -629,7 +628,7 @@ nice_agent_class_init (NiceAgentClass *klass)
0,
NULL,
NULL,
agent_marshal_VOID__UINT,
NULL,
G_TYPE_NONE,
1,
G_TYPE_UINT, G_TYPE_INVALID);
......@@ -653,7 +652,7 @@ nice_agent_class_init (NiceAgentClass *klass)
0,
NULL,
NULL,
agent_marshal_VOID__UINT_UINT_STRING_STRING,
NULL,
G_TYPE_NONE,
4,
G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING,
......@@ -677,7 +676,7 @@ nice_agent_class_init (NiceAgentClass *klass)
0,
NULL,
NULL,
agent_marshal_VOID__UINT_UINT_STRING,
NULL,
G_TYPE_NONE,
3,
G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
......@@ -701,7 +700,7 @@ nice_agent_class_init (NiceAgentClass *klass)
0,
NULL,
NULL,
agent_marshal_VOID__UINT_UINT_STRING,
NULL,
G_TYPE_NONE,
3,
G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
......@@ -723,7 +722,7 @@ nice_agent_class_init (NiceAgentClass *klass)
0,
NULL,
NULL,
agent_marshal_VOID__UINT,
NULL,
G_TYPE_NONE,
1,
G_TYPE_UINT,
......@@ -751,7 +750,7 @@ nice_agent_class_init (NiceAgentClass *klass)
0,
NULL,
NULL,
agent_marshal_VOID__UINT_UINT,
NULL,
G_TYPE_NONE,
2,
G_TYPE_UINT, G_TYPE_UINT,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment