multi{fd,socket}sink: rename client-handle-removed signal to client-{fd,socket}-removed

This commit is contained in:
Tim-Philipp Müller 2012-09-09 02:00:49 +01:00
parent 84a3add409
commit 9efb5f5af2
2 changed files with 9 additions and 12 deletions

View file

@ -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 */

View file

@ -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);