diff options
| author | Olivier Crête <olivier.crete@collabora.co.uk> | 2009-04-20 17:43:39 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.co.uk> | 2009-04-20 20:23:37 -0400 |
| commit | 655a3d125a31ec8953a6dcc3567087f4fbe4a84d (patch) | |
| tree | c9e0b0c7b67128ed67aa9b4240b5cc21f08ec3fb /gst/rtpmux/gstrtpdtmfmux.c | |
| parent | 5af0efd1d31d037220d10b5b0d1e8aa3fb31bcac (diff) | |
| download | gst-plugins-bad-655a3d125a31ec8953a6dcc3567087f4fbe4a84d.tar.gz gst-plugins-bad-655a3d125a31ec8953a6dcc3567087f4fbe4a84d.tar.bz2 gst-plugins-bad-655a3d125a31ec8953a6dcc3567087f4fbe4a84d.zip | |
rtpmux: Use GST_BOILERPLATE
Diffstat (limited to 'gst/rtpmux/gstrtpdtmfmux.c')
| -rw-r--r-- | gst/rtpmux/gstrtpdtmfmux.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/gst/rtpmux/gstrtpdtmfmux.c b/gst/rtpmux/gstrtpdtmfmux.c index 692bf595..573a1d1b 100644 --- a/gst/rtpmux/gstrtpdtmfmux.c +++ b/gst/rtpmux/gstrtpdtmfmux.c @@ -87,8 +87,6 @@ enum static guint gst_rtpdtmfmux_signals[LAST_SIGNAL] = { 0 }; -static void gst_rtp_dtmf_mux_base_init (gpointer g_class); -static void gst_rtp_dtmf_mux_class_init (GstRTPDTMFMuxClass * klass); static void gst_rtp_dtmf_mux_dispose (GObject * object); static void gst_rtp_mux_release_pad (GstElement * element, GstPad * pad); @@ -96,31 +94,11 @@ static void gst_rtp_mux_release_pad (GstElement * element, GstPad * pad); static gboolean gst_rtp_dtmf_mux_sink_event (GstPad * pad, GstEvent * event); static GstFlowReturn gst_rtp_dtmf_mux_chain (GstPad * pad, GstBuffer * buffer); -static GstRTPMuxClass *parent_class = NULL; +GST_BOILERPLATE (GstRTPDTMFMux, gst_rtp_dtmf_mux, GstRTPMux, GST_TYPE_RTP_MUX); -GType -gst_rtp_dtmf_mux_get_type (void) +static void +gst_rtp_dtmf_mux_init (GstRTPDTMFMux * object, GstRTPDTMFMuxClass * g_class) { - static GType mux_type = 0; - - if (!mux_type) { - static const GTypeInfo mux_info = { - sizeof (GstRTPDTMFMuxClass), - gst_rtp_dtmf_mux_base_init, - NULL, - (GClassInitFunc) gst_rtp_dtmf_mux_class_init, - NULL, - NULL, - sizeof (GstRTPDTMFMux), - 0, - (GInstanceInitFunc) NULL, - }; - - mux_type = - g_type_register_static (GST_TYPE_RTP_MUX, "GstRTPDTMFMux", - &mux_info, 0); - } - return mux_type; } static void @@ -142,8 +120,6 @@ gst_rtp_dtmf_mux_class_init (GstRTPDTMFMuxClass * klass) gstelement_class = (GstElementClass *) klass; gstrtpmux_class = (GstRTPMuxClass *) klass; - parent_class = g_type_class_peek_parent (klass); - gst_rtpdtmfmux_signals[SIGNAL_LOCKING_STREAM] = g_signal_new ("locking", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTPDTMFMuxClass, locking), NULL, NULL, |