[0.11] gst-plugins-good: udp: fix get-stats action signal registration

Tim Müller tpm at kemper.freedesktop.org
Thu Jan 26 07:43:23 PST 2012


Module: gst-plugins-good
Branch: 0.11
Commit: 80f319b7dabfcf6249941f16c224352f660a2f81
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=80f319b7dabfcf6249941f16c224352f660a2f81

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Thu Jan 26 15:30:41 2012 +0000

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 9f4d688..5abe03b 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 d7f4d01..3801328 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 f75e74d..ae1d6b5 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:



More information about the gstreamer-commits mailing list