From 36161f36fe047398414d8b79ad7fca9e61b347aa Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 20 Jul 2004 10:04:00 +0000 Subject: [PATCH] gst/tcp/: Fixed the stupid marshal definition. Original commit message from CVS: * gst/tcp/gstmultifdsink.c: (gst_multifdsink_class_init), (gst_multifdsink_add), (gst_multifdsink_client_remove), (gst_multifdsink_handle_client_write), (gst_multifdsink_queue_buffer): * gst/tcp/gsttcp-marshal.list: Fixed the stupid marshal definition. --- ChangeLog | 9 +++++++++ gst/tcp/gstmultifdsink.c | 11 +++++------ gst/tcp/gsttcp-marshal.list | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00b57af4b0..0b0bee7266 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-07-20 Wim Taymans + + * gst/tcp/gstmultifdsink.c: (gst_multifdsink_class_init), + (gst_multifdsink_add), (gst_multifdsink_client_remove), + (gst_multifdsink_handle_client_write), + (gst_multifdsink_queue_buffer): + * gst/tcp/gsttcp-marshal.list: + Fixed the stupid marshal definition. + 2004-07-20 Wim Taymans * gst/tcp/gstmultifdsink.c: (gst_multifdsink_class_init), diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c index 15cf270007..6bad02f66c 100644 --- a/gst/tcp/gstmultifdsink.c +++ b/gst/tcp/gstmultifdsink.c @@ -241,13 +241,12 @@ gst_multifdsink_class_init (GstMultiFdSinkClass * klass) gst_multifdsink_signals[SIGNAL_CLIENT_ADDED] = g_signal_new ("client-added", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMultiFdSinkClass, client_added), - NULL, NULL, gst_tcp_marshal_VOID__STRING_UINT, G_TYPE_NONE, 2, - G_TYPE_STRING, G_TYPE_UINT); + NULL, NULL, gst_tcp_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); gst_multifdsink_signals[SIGNAL_CLIENT_REMOVED] = g_signal_new ("client-removed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMultiFdSinkClass, - client_removed), NULL, NULL, gst_tcp_marshal_VOID__STRING_UINT, - G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_UINT); + client_removed), NULL, NULL, gst_tcp_marshal_VOID__INT, + G_TYPE_NONE, 1, G_TYPE_INT); gobject_class->set_property = gst_multifdsink_set_property; gobject_class->get_property = gst_multifdsink_get_property; @@ -332,7 +331,7 @@ gst_multifdsink_add (GstMultiFdSink * sink, int fd) g_mutex_unlock (sink->clientslock); g_signal_emit (G_OBJECT (sink), - gst_multifdsink_signals[SIGNAL_CLIENT_ADDED], 0, NULL, fd); + gst_multifdsink_signals[SIGNAL_CLIENT_ADDED], 0, fd); } void @@ -434,7 +433,7 @@ gst_multifdsink_client_remove (GstMultiFdSink * sink, GstTCPClient * client) client->connect_interval = client->disconnect_time = client->connect_time; g_signal_emit (G_OBJECT (sink), - gst_multifdsink_signals[SIGNAL_CLIENT_REMOVED], 0, NULL, fd); + gst_multifdsink_signals[SIGNAL_CLIENT_REMOVED], 0, fd); sink->clients = g_list_remove (sink->clients, client); diff --git a/gst/tcp/gsttcp-marshal.list b/gst/tcp/gsttcp-marshal.list index 7d4a258dad..c50d52a65a 100644 --- a/gst/tcp/gsttcp-marshal.list +++ b/gst/tcp/gsttcp-marshal.list @@ -1,2 +1,3 @@ VOID:STRING,UINT +VOID:INT BOXED:INT