From 35b6668fb69be0945e5c9cf1ecb3e42f691640bc Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 4 Nov 2011 12:22:37 +0100 Subject: [PATCH] rtpmux: make request pads take _%u --- gst/rtpmanager/gstrtpdtmfmux.c | 8 ++++---- gst/rtpmanager/gstrtpmux.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gst/rtpmanager/gstrtpdtmfmux.c b/gst/rtpmanager/gstrtpdtmfmux.c index 97ffacd..5e6d041 100644 --- a/gst/rtpmanager/gstrtpdtmfmux.c +++ b/gst/rtpmanager/gstrtpdtmfmux.c @@ -31,8 +31,8 @@ * * The RTP "DTMF" Muxer muxes multiple RTP streams into a valid RTP * stream. It does exactly what it's parent (#rtpmux) does, except - * that it prevent buffers coming over a regular sink_%%d pad from going through - * for the duration of buffers that came in a priority_sink_%%d pad. + * that it prevent buffers coming over a regular sink_%%u pad from going through + * for the duration of buffers that came in a priority_sink_%%u pad. * * This is especially useful if a discontinuous source like dtmfsrc or * rtpdtmfsrc are connected to the priority sink pads. This way, the generated @@ -52,7 +52,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_rtp_dtmf_mux_debug); #define GST_CAT_DEFAULT gst_rtp_dtmf_mux_debug static GstStaticPadTemplate priority_sink_factory = -GST_STATIC_PAD_TEMPLATE ("priority_sink_%d", +GST_STATIC_PAD_TEMPLATE ("priority_sink_%u", GST_PAD_SINK, GST_PAD_REQUEST, GST_STATIC_CAPS ("application/x-rtp")); @@ -168,7 +168,7 @@ gst_rtp_dtmf_mux_request_new_pad (GstElement * element, GstPadTemplate * templ, padpriv = gst_pad_get_element_private (pad); if (gst_element_class_get_pad_template (GST_ELEMENT_GET_CLASS (element), - "priority_sink_%d") == gst_pad_get_pad_template (pad)) + "priority_sink_%u") == gst_pad_get_pad_template (pad)) padpriv->priority = TRUE; GST_OBJECT_UNLOCK (element); } diff --git a/gst/rtpmanager/gstrtpmux.c b/gst/rtpmanager/gstrtpmux.c index f86fd5d..6bc9a4d 100644 --- a/gst/rtpmanager/gstrtpmux.c +++ b/gst/rtpmanager/gstrtpmux.c @@ -82,7 +82,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_CAPS ("application/x-rtp") ); -static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink_%d", +static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink_%u", GST_PAD_SINK, GST_PAD_REQUEST, GST_STATIC_CAPS ("application/x-rtp") @@ -107,7 +107,7 @@ static void gst_rtp_mux_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static void gst_rtp_mux_dispose (GObject * object); -static gboolean gst_rtp_mux_src_event_real (GstRTPMux *rtp_mux, +static gboolean gst_rtp_mux_src_event_real (GstRTPMux * rtp_mux, GstEvent * event); GST_BOILERPLATE (GstRTPMux, gst_rtp_mux, GstElement, GST_TYPE_ELEMENT); @@ -204,7 +204,7 @@ gst_rtp_mux_src_event (GstPad * pad, GstEvent * event) } static gboolean -gst_rtp_mux_src_event_real (GstRTPMux *rtp_mux, GstEvent * event) +gst_rtp_mux_src_event_real (GstRTPMux * rtp_mux, GstEvent * event) { GstIterator *iter; GstPad *sinkpad; -- 2.7.4