From d337dda7363352c89369fcae3bb0db898b092a5b Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Fri, 18 May 2007 09:35:28 +0000 Subject: ext/amrwb/gstamrwbdec.c (gst_amrwbdec_debug, GST_CAT_DEFAULT, _do_init, gst_amrwbdec_base_init, gst_amrwbdec_class_in... Original commit message from CVS: * ext/amrwb/gstamrwbdec.c (gst_amrwbdec_debug, GST_CAT_DEFAULT, _do_init, gst_amrwbdec_base_init, gst_amrwbdec_class_init): * ext/amrwb/gstamrwbenc.c (gst_amrwbenc_debug, GST_CAT_DEFAULT, _do_init, gst_amrwbenc_base_init, gst_amrwbenc_class_init): * ext/amrwb/gstamrwbparse.c (gst_amrwbparse_debug, GST_CAT_DEFAULT, _do_init, gst_amrwbparse_base_init, gst_amrwbparse_class_init): First round of cleanups, that use GST_BOILERPLATE, GST_ELEMENT_DETAILS, GST_DEBUG_FUNCPTR and add log-category. --- ext/amrwb/gstamrwbenc.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'ext/amrwb/gstamrwbenc.c') diff --git a/ext/amrwb/gstamrwbenc.c b/ext/amrwb/gstamrwbenc.c index 5319e899..0d8e91e0 100644 --- a/ext/amrwb/gstamrwbenc.c +++ b/ext/amrwb/gstamrwbenc.c @@ -23,13 +23,6 @@ #include "gstamrwbenc.h" -static const GstElementDetails gst_amrwbenc_details = -GST_ELEMENT_DETAILS ("AMR-WB audio encoder", - "Codec/Encoder/Audio", - "Adaptive Multi-Rate Wideband audio encoder", - "Renato Araujo "); - - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -48,10 +41,9 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", "rate = (int) 16000, " "channels = (int) 1") ); -static void gst_amrwbenc_base_init (gpointer klass); -static void gst_amrwbenc_class_init (GstAmrwbEncClass * klass); -static void gst_amrwbenc_init (GstAmrwbEnc * amrwbenc, - GstAmrwbEncClass * klass); +GST_DEBUG_CATEGORY_STATIC (gst_amrwbenc_debug); +#define GST_CAT_DEFAULT gst_amrwbenc_debug + static void gst_amrwbenc_finalize (GObject * object); static GstFlowReturn gst_amrwbenc_chain (GstPad * pad, GstBuffer * buffer); @@ -59,20 +51,27 @@ static gboolean gst_amrwbenc_setcaps (GstPad * pad, GstCaps * caps); static GstStateChangeReturn gst_amrwbenc_state_change (GstElement * element, GstStateChange transition); +#define _do_init(bla) \ + GST_DEBUG_CATEGORY_INIT (gst_amrwbenc_debug, "amrwbenc", 0, "AMR-WB audio encoder"); -GST_BOILERPLATE (GstAmrwbEnc, gst_amrwbenc, GstElement, GST_TYPE_ELEMENT); +GST_BOILERPLATE_FULL (GstAmrwbEnc, gst_amrwbenc, GstElement, GST_TYPE_ELEMENT, + _do_init); static void gst_amrwbenc_base_init (gpointer klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + GstElementDetails details = GST_ELEMENT_DETAILS ("AMR-WB audio encoder", + "Codec/Encoder/Audio", + "Adaptive Multi-Rate Wideband audio encoder", + "Renato Araujo "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &gst_amrwbenc_details); + gst_element_class_set_details (element_class, &details); } static void @@ -81,11 +80,9 @@ gst_amrwbenc_class_init (GstAmrwbEncClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - parent_class = g_type_class_peek_parent (klass); - object_class->finalize = gst_amrwbenc_finalize; - element_class->change_state = gst_amrwbenc_state_change; + element_class->change_state = GST_DEBUG_FUNCPTR (gst_amrwbenc_state_change); } static void -- cgit v1.2.1