From 9efb5f5af26e40b80ed4628dd7bb56ed01e15fa9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 9 Sep 2012 02:00:49 +0100 Subject: [PATCH] multi{fd,socket}sink: rename client-handle-removed signal to client-{fd,socket}-removed --- gst/tcp/gstmultifdsink.c | 12 +++++------- gst/tcp/gstmultisocketsink.c | 9 ++++----- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c index 43aed79..aa8d17c 100644 --- a/gst/tcp/gstmultifdsink.c +++ b/gst/tcp/gstmultifdsink.c @@ -142,7 +142,7 @@ enum /* signals */ SIGNAL_CLIENT_ADDED, SIGNAL_CLIENT_REMOVED, - SIGNAL_CLIENT_HANDLE_REMOVED, + SIGNAL_CLIENT_FD_REMOVED, LAST_SIGNAL }; @@ -355,9 +355,8 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) * * Since: 0.10.7 */ - /* FIXME: rename to client-fd-removed */ - gst_multi_fd_sink_signals[SIGNAL_CLIENT_HANDLE_REMOVED] = - g_signal_new ("client-handle-removed", G_TYPE_FROM_CLASS (klass), + gst_multi_fd_sink_signals[SIGNAL_CLIENT_FD_REMOVED] = + g_signal_new ("client-fd-removed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, gst_tcp_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); @@ -437,9 +436,8 @@ static void gst_multi_fd_sink_client_free (GstMultiHandleSink * mhsink, GstMultiHandleClient * client) { - g_signal_emit (mhsink, - gst_multi_fd_sink_signals[SIGNAL_CLIENT_HANDLE_REMOVED], 0, - client->handle.fd); + g_signal_emit (mhsink, gst_multi_fd_sink_signals[SIGNAL_CLIENT_FD_REMOVED], + 0, client->handle.fd); } /* action signals */ diff --git a/gst/tcp/gstmultisocketsink.c b/gst/tcp/gstmultisocketsink.c index e395501..afac99f 100644 --- a/gst/tcp/gstmultisocketsink.c +++ b/gst/tcp/gstmultisocketsink.c @@ -133,7 +133,7 @@ enum /* signals */ SIGNAL_CLIENT_ADDED, SIGNAL_CLIENT_REMOVED, - SIGNAL_CLIENT_HANDLE_REMOVED, + SIGNAL_CLIENT_SOCKET_REMOVED, LAST_SIGNAL }; @@ -344,9 +344,8 @@ gst_multi_socket_sink_class_init (GstMultiSocketSinkClass * klass) * * Since: 0.10.7 */ - /* FIXME: rename to client-socket-removed */ - gst_multi_socket_sink_signals[SIGNAL_CLIENT_HANDLE_REMOVED] = - g_signal_new ("client-handle-removed", G_TYPE_FROM_CLASS (klass), + gst_multi_socket_sink_signals[SIGNAL_CLIENT_SOCKET_REMOVED] = + g_signal_new ("client-socket-removed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_SOCKET); @@ -535,7 +534,7 @@ gst_multi_socket_sink_client_free (GstMultiHandleSink * mhsink, g_assert (G_IS_SOCKET (client->handle.socket)); g_signal_emit (mhsink, - gst_multi_socket_sink_signals[SIGNAL_CLIENT_HANDLE_REMOVED], 0, + gst_multi_socket_sink_signals[SIGNAL_CLIENT_SOCKET_REMOVED], 0, client->handle.socket); g_object_unref (client->handle.socket); -- 2.7.4