From b5aaf1e1a9df25cc511c7b81f8e910fee1e33eaf Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 6 Feb 2008 15:07:30 +0000 Subject: [PATCH] gst/tcp/gstfdset.h: Remove unused field to same some memory. Original commit message from CVS: * gst/tcp/gstfdset.h: Remove unused field to same some memory. * gst/tcp/gstmultifdsink.c: (gst_multi_fd_sink_class_init): Mark action signals as such. --- ChangeLog | 8 ++++++++ gst/tcp/gstfdset.h | 1 - gst/tcp/gstmultifdsink.c | 44 ++++++++++++++++++++++------------------ 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index a6cef22d04..3be31c10b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-02-06 Wim Taymans + + * gst/tcp/gstfdset.h: + Remove unused field to same some memory. + + * gst/tcp/gstmultifdsink.c: (gst_multi_fd_sink_class_init): + Mark action signals as such. + 2008-02-06 Michael Smith * ext/theora/theoradec.c: (_theora_granule_frame), diff --git a/gst/tcp/gstfdset.h b/gst/tcp/gstfdset.h index caf06c084d..1f9349066e 100644 --- a/gst/tcp/gstfdset.h +++ b/gst/tcp/gstfdset.h @@ -32,7 +32,6 @@ typedef struct _GstFDSet GstFDSet; typedef struct { int fd; gint idx; - gpointer data; } GstFD; typedef enum { diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c index ad77c54f09..d115d806f5 100644 --- a/gst/tcp/gstmultifdsink.c +++ b/gst/tcp/gstmultifdsink.c @@ -472,9 +472,10 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) * Hand the given open file descriptor to multifdsink to write to. */ gst_multi_fd_sink_signals[SIGNAL_ADD] = - g_signal_new ("add", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstMultiFdSinkClass, add), - NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + g_signal_new ("add", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiFdSinkClass, + add), NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, + G_TYPE_INT); /** * GstMultiFdSink::add-full: * @gstmultifdsink: the multifdsink element to emit this signal on @@ -491,11 +492,12 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) * specify the burst parameters for the new connection. */ gst_multi_fd_sink_signals[SIGNAL_ADD_BURST] = - g_signal_new ("add-full", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstMultiFdSinkClass, add_full), - NULL, NULL, gst_tcp_marshal_VOID__INT_BOOLEAN_INT_UINT64_INT_UINT64, - G_TYPE_NONE, 6, G_TYPE_INT, G_TYPE_BOOLEAN, GST_TYPE_UNIT_TYPE, - G_TYPE_UINT64, GST_TYPE_UNIT_TYPE, G_TYPE_UINT64); + g_signal_new ("add-full", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiFdSinkClass, + add_full), NULL, NULL, + gst_tcp_marshal_VOID__INT_BOOLEAN_INT_UINT64_INT_UINT64, G_TYPE_NONE, 6, + G_TYPE_INT, G_TYPE_BOOLEAN, GST_TYPE_UNIT_TYPE, G_TYPE_UINT64, + GST_TYPE_UNIT_TYPE, G_TYPE_UINT64); /** * GstMultiFdSink::remove: * @gstmultifdsink: the multifdsink element to emit this signal on @@ -504,9 +506,10 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) * Remove the given open file descriptor from multifdsink. */ gst_multi_fd_sink_signals[SIGNAL_REMOVE] = - g_signal_new ("remove", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstMultiFdSinkClass, remove), - NULL, NULL, gst_tcp_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + g_signal_new ("remove", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiFdSinkClass, + remove), NULL, NULL, gst_tcp_marshal_VOID__INT, G_TYPE_NONE, 1, + G_TYPE_INT); /** * GstMultiFdSink::remove_flush: * @gstmultifdsink: the multifdsink element to emit this signal on @@ -517,8 +520,9 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) */ gst_multi_fd_sink_signals[SIGNAL_REMOVE_FLUSH] = g_signal_new ("remove-flush", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMultiFdSinkClass, remove_flush), - NULL, NULL, gst_tcp_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiFdSinkClass, + remove_flush), NULL, NULL, gst_tcp_marshal_VOID__INT, G_TYPE_NONE, 1, + G_TYPE_INT); /** * GstMultiFdSink::clear: * @gstmultifdsink: the multifdsink element to emit this signal on @@ -528,9 +532,9 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) * should do so by connecting to the client-fd-removed callback. */ gst_multi_fd_sink_signals[SIGNAL_CLEAR] = - g_signal_new ("clear", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstMultiFdSinkClass, clear), - NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + g_signal_new ("clear", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiFdSinkClass, + clear), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * GstMultiFdSink::get-stats: @@ -549,10 +553,10 @@ gst_multi_fd_sink_class_init (GstMultiFdSinkClass * klass) * The array can be 0-length if the client was not found. */ gst_multi_fd_sink_signals[SIGNAL_GET_STATS] = - g_signal_new ("get-stats", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstMultiFdSinkClass, get_stats), - NULL, NULL, gst_tcp_marshal_BOXED__INT, G_TYPE_VALUE_ARRAY, 1, - G_TYPE_INT); + g_signal_new ("get-stats", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiFdSinkClass, + get_stats), NULL, NULL, gst_tcp_marshal_BOXED__INT, + G_TYPE_VALUE_ARRAY, 1, G_TYPE_INT); /** * GstMultiFdSink::client-added: