From 80f319b7dabfcf6249941f16c224352f660a2f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 26 Jan 2012 15:30:41 +0000 Subject: [PATCH] udp: fix get-stats action signal registration It returns a GstStructure now, not a GValueArray --- gst/udp/gstdynudpsink.c | 8 ++++++-- gst/udp/gstdynudpsink.h | 2 -- gst/udp/gstmultiudpsink.c | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c index 9f4d6881f0..5abe03bea6 100644 --- a/gst/udp/gstdynudpsink.c +++ b/gst/udp/gstdynudpsink.c @@ -72,6 +72,8 @@ static void gst_dynudpsink_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void gst_dynudpsink_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); +static GstStructure *gst_dynudpsink_get_stats (GstDynUDPSink * sink, + const gchar * host, gint port); static guint gst_dynudpsink_signals[LAST_SIGNAL] = { 0 }; @@ -98,7 +100,7 @@ gst_dynudpsink_class_init (GstDynUDPSinkClass * klass) gst_dynudpsink_signals[SIGNAL_GET_STATS] = g_signal_new ("get-stats", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDynUDPSinkClass, get_stats), - NULL, NULL, gst_udp_marshal_BOXED__STRING_INT, G_TYPE_VALUE_ARRAY, 2, + NULL, NULL, gst_udp_marshal_BOXED__STRING_INT, GST_TYPE_STRUCTURE, 2, G_TYPE_STRING, G_TYPE_INT); g_object_class_install_property (gobject_class, PROP_SOCKET, @@ -125,6 +127,8 @@ gst_dynudpsink_class_init (GstDynUDPSinkClass * klass) gstbasesink_class->unlock = gst_dynudpsink_unlock; gstbasesink_class->unlock_stop = gst_dynudpsink_unlock_stop; + klass->get_stats = gst_dynudpsink_get_stats; + GST_DEBUG_CATEGORY_INIT (dynudpsink_debug, "dynudpsink", 0, "UDP sink"); } @@ -330,7 +334,7 @@ no_socket: } } -GstStructure * +static GstStructure * gst_dynudpsink_get_stats (GstDynUDPSink * sink, const gchar * host, gint port) { return NULL; diff --git a/gst/udp/gstdynudpsink.h b/gst/udp/gstdynudpsink.h index d7f4d015b5..38013288aa 100644 --- a/gst/udp/gstdynudpsink.h +++ b/gst/udp/gstdynudpsink.h @@ -66,8 +66,6 @@ struct _GstDynUDPSinkClass { GType gst_dynudpsink_get_type(void); -GstStructure* gst_dynudpsink_get_stats (GstDynUDPSink *sink, const gchar *host, gint port); - G_END_DECLS #endif /* __GST_DYNUDPSINK_H__ */ diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c index f75e74d91a..ae1d6b58bc 100644 --- a/gst/udp/gstmultiudpsink.c +++ b/gst/udp/gstmultiudpsink.c @@ -203,7 +203,7 @@ gst_multiudpsink_class_init (GstMultiUDPSinkClass * klass) g_signal_new ("get-stats", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstMultiUDPSinkClass, get_stats), - NULL, NULL, gst_udp_marshal_BOXED__STRING_INT, G_TYPE_VALUE_ARRAY, 2, + NULL, NULL, gst_udp_marshal_BOXED__STRING_INT, GST_TYPE_STRUCTURE, 2, G_TYPE_STRING, G_TYPE_INT); /** * GstMultiUDPSink::client-added: