mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/tcp/: Fixed the stupid marshal definition.

Browse source 
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.
This commit is contained in:
Wim Taymans 2004-07-20 10:04:00 +00:00
parent f087fddb7e
commit 36161f36fe
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2004-07-20 Wim Taymans <wim@fluendo.com>
* 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 <wim@fluendo.com> 2004-07-20 Wim Taymans <wim@fluendo.com>
* gst/tcp/gstmultifdsink.c: (gst_multifdsink_class_init), * gst/tcp/gstmultifdsink.c: (gst_multifdsink_class_init),

11
gst/tcp/gstmultifdsink.c
View file

@ -241,13 +241,12 @@ gst_multifdsink_class_init (GstMultiFdSinkClass * klass)
gst_multifdsink_signals[SIGNAL_CLIENT_ADDED] = gst_multifdsink_signals[SIGNAL_CLIENT_ADDED] =
g_signal_new ("client-added", G_TYPE_FROM_CLASS (klass), g_signal_new ("client-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMultiFdSinkClass, client_added), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMultiFdSinkClass, client_added),
NULL, NULL, gst_tcp_marshal_VOID__STRING_UINT, G_TYPE_NONE, 2, NULL, NULL, gst_tcp_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
G_TYPE_STRING, G_TYPE_UINT);
gst_multifdsink_signals[SIGNAL_CLIENT_REMOVED] = gst_multifdsink_signals[SIGNAL_CLIENT_REMOVED] =
g_signal_new ("client-removed", G_TYPE_FROM_CLASS (klass), g_signal_new ("client-removed", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMultiFdSinkClass, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMultiFdSinkClass,
client_removed), NULL, NULL, gst_tcp_marshal_VOID__STRING_UINT, client_removed), NULL, NULL, gst_tcp_marshal_VOID__INT,
G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_UINT); G_TYPE_NONE, 1, G_TYPE_INT);
gobject_class->set_property = gst_multifdsink_set_property; gobject_class->set_property = gst_multifdsink_set_property;
gobject_class->get_property = gst_multifdsink_get_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_mutex_unlock (sink->clientslock);
g_signal_emit (G_OBJECT (sink), g_signal_emit (G_OBJECT (sink),
gst_multifdsink_signals[SIGNAL_CLIENT_ADDED], 0, NULL, fd); gst_multifdsink_signals[SIGNAL_CLIENT_ADDED], 0, fd);
} }
void void
@ -434,7 +433,7 @@ gst_multifdsink_client_remove (GstMultiFdSink * sink, GstTCPClient * client)
client->connect_interval = client->disconnect_time = client->connect_time; client->connect_interval = client->disconnect_time = client->connect_time;
g_signal_emit (G_OBJECT (sink), 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); sink->clients = g_list_remove (sink->clients, client);

1
gst/tcp/gsttcp-marshal.list
View file

@ -1,2 +1,3 @@
VOID:STRING,UINT VOID:STRING,UINT
VOID:INT
BOXED:INT BOXED:INT