From 14d79a36f3ee209a9f660f0a96df977760dc4d0f Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Mon, 12 Feb 2007 12:43:00 +0000 Subject: [PATCH] gst/goom/gstgoom.*: Improved docs and use GST_DEBUG_FUNCPTR. Original commit message from CVS: * gst/goom/gstgoom.c: (gst_goom_class_init), (gst_goom_init), (gst_goom_change_state): * gst/goom/gstgoom.h: Improved docs and use GST_DEBUG_FUNCPTR. * gst/level/gstlevel.c: (gst_level_class_init): Use GST_DEBUG_FUNCPTR. * gst/monoscope/gstmonoscope.c: (gst_monoscope_init), (gst_monoscope_chain), (gst_monoscope_change_state): Improved docs source cleanups. --- ChangeLog | 16 ++++++++++++++++ gst/goom/gstgoom.c | 22 +++++++++++++++------- gst/goom/gstgoom.h | 8 ++++---- gst/level/gstlevel.c | 4 ++-- gst/monoscope/gstmonoscope.c | 14 +++++++++----- 5 files changed, 46 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed2e9b0..a631ab6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2007-02-12 Stefan Kost + + * gst/goom/gstgoom.c: (gst_goom_class_init), (gst_goom_init), + (gst_goom_change_state): + * gst/goom/gstgoom.h: + Improved docs and use GST_DEBUG_FUNCPTR. + + * gst/level/gstlevel.c: (gst_level_class_init): + Use GST_DEBUG_FUNCPTR. + + * gst/monoscope/gstmonoscope.c: (gst_monoscope_init), + (gst_monoscope_chain), (gst_monoscope_change_state): + Improved docs source cleanups. + 2007-02-12 Tim-Philipp Müller * gst/debug/Makefile.am: @@ -456,6 +470,8 @@ 2007-01-18 Stefan Kost + Patch by: Sebastian Dröge + * gst/audiofx/audiopanorama.c: Fix doc section name (Fixes #397946) diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index 19b38c9..a52b1a8 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -23,6 +23,10 @@ * @see_also: synaesthesia * * + * + * Goom is an audio visualisation element. It creates warping structures + * based on the incomming audio signal. + * * Example launch line * * @@ -148,7 +152,7 @@ gst_goom_class_init (GstGoomClass * klass) gobject_class->finalize = gst_goom_finalize; - gstelement_class->change_state = gst_goom_change_state; + gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_goom_change_state); GST_DEBUG_CATEGORY_INIT (goom_debug, "goom", 0, "goom visualisation element"); } @@ -158,14 +162,19 @@ gst_goom_init (GstGoom * goom) { /* create the sink and src pads */ goom->sinkpad = gst_pad_new_from_static_template (&sink_template, "sink"); - gst_pad_set_chain_function (goom->sinkpad, gst_goom_chain); - gst_pad_set_event_function (goom->sinkpad, gst_goom_sink_event); - gst_pad_set_setcaps_function (goom->sinkpad, gst_goom_sink_setcaps); + gst_pad_set_chain_function (goom->sinkpad, + GST_DEBUG_FUNCPTR (gst_goom_chain)); + gst_pad_set_event_function (goom->sinkpad, + GST_DEBUG_FUNCPTR (gst_goom_sink_event)); + gst_pad_set_setcaps_function (goom->sinkpad, + GST_DEBUG_FUNCPTR (gst_goom_sink_setcaps)); gst_element_add_pad (GST_ELEMENT (goom), goom->sinkpad); goom->srcpad = gst_pad_new_from_static_template (&src_template, "src"); - gst_pad_set_setcaps_function (goom->srcpad, gst_goom_src_setcaps); - gst_pad_set_event_function (goom->srcpad, gst_goom_src_event); + gst_pad_set_setcaps_function (goom->srcpad, + GST_DEBUG_FUNCPTR (gst_goom_src_setcaps)); + gst_pad_set_event_function (goom->srcpad, + GST_DEBUG_FUNCPTR (gst_goom_src_event)); gst_element_add_pad (GST_ELEMENT (goom), goom->srcpad); goom->adapter = gst_adapter_new (); @@ -548,7 +557,6 @@ gst_goom_change_state (GstElement * element, GstStateChange transition) GstGoom *goom = GST_GOOM (element); GstStateChangeReturn ret; - switch (transition) { case GST_STATE_CHANGE_NULL_TO_READY: break; diff --git a/gst/goom/gstgoom.h b/gst/goom/gstgoom.h index cf49cdd..e3432de 100644 --- a/gst/goom/gstgoom.h +++ b/gst/goom/gstgoom.h @@ -28,10 +28,10 @@ G_BEGIN_DECLS #define GOOM_SAMPLES 512 -#define GST_TYPE_GOOM (gst_goom_get_type()) -#define GST_GOOM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GOOM,GstGoom)) -#define GST_GOOM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GOOM,GstGoomClass)) -#define GST_IS_GOOM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GOOM)) +#define GST_TYPE_GOOM (gst_goom_get_type()) +#define GST_GOOM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GOOM,GstGoom)) +#define GST_GOOM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GOOM,GstGoomClass)) +#define GST_IS_GOOM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GOOM)) #define GST_IS_GOOM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GOOM)) typedef struct _GstGoom GstGoom; diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c index 1043919..fcb0907 100644 --- a/gst/level/gstlevel.c +++ b/gst/level/gstlevel.c @@ -183,8 +183,8 @@ gst_level_class_init (GstLevelClass * klass) GST_DEBUG_CATEGORY_INIT (level_debug, "level", 0, "Level calculation"); - trans_class->set_caps = gst_level_set_caps; - trans_class->transform_ip = gst_level_transform_ip; + trans_class->set_caps = GST_DEBUG_FUNCPTR (gst_level_set_caps); + trans_class->transform_ip = GST_DEBUG_FUNCPTR (gst_level_transform_ip); trans_class->passthrough_on_same_caps = TRUE; } diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c index 9d84cd9..4221ee4 100644 --- a/gst/monoscope/gstmonoscope.c +++ b/gst/monoscope/gstmonoscope.c @@ -21,9 +21,13 @@ /** * SECTION:element-monoscope - * @see_also: monoscope + * @see_also: goom * * + * + * Synaesthesia is an audio visualisation element. It creates a colored + * curve of the audio signal like on an oszilloscope. + * * Example launch line * * @@ -159,6 +163,9 @@ gst_monoscope_init (GstMonoscope * monoscope, GstMonoscopeClass * klass) monoscope->fps_num = 25; /* desired frame rate */ monoscope->fps_denom = 1; monoscope->visstate = NULL; + + /* reset the initial audio state */ + monoscope->rate = GST_AUDIO_DEF_RATE; } static void @@ -309,8 +316,8 @@ get_buffer (GstMonoscope * monoscope, GstBuffer ** outbuf) static GstFlowReturn gst_monoscope_chain (GstPad * pad, GstBuffer * inbuf) { + GstFlowReturn flow_ret = GST_FLOW_OK; GstMonoscope *monoscope; - GstFlowReturn flow_ret; monoscope = GST_MONOSCOPE (GST_PAD_PARENT (pad)); @@ -331,8 +338,6 @@ gst_monoscope_chain (GstPad * pad, GstBuffer * inbuf) gst_adapter_push (monoscope->adapter, inbuf); inbuf = NULL; - flow_ret = GST_FLOW_OK; - /* Collect samples until we have enough for an output frame */ while (flow_ret == GST_FLOW_OK) { gint16 *samples; @@ -516,7 +521,6 @@ gst_monoscope_change_state (GstElement * element, GstStateChange transition) GstMonoscope *monoscope = GST_MONOSCOPE (element); GstStateChangeReturn ret; - switch (transition) { case GST_STATE_CHANGE_NULL_TO_READY: break; -- 2.7.4