From 62b2da11863257554c241c8d7be43d9ea0c975c9 Mon Sep 17 00:00:00 2001 From: Abramo Bagnara Date: Fri, 30 Mar 2001 10:12:19 +0000 Subject: [PATCH] Documentation generation fixes --- doc/doxygen.cfg | 1 + include/local.h | 1 + src/conf.c | 5 ++--- src/control/control.c | 2 -- src/control/hcontrol.c | 3 --- src/input.c | 3 ++- src/mixer/mixer.c | 2 +- src/mixer/simple.c | 9 ++++++--- src/output.c | 2 +- src/pcm/pcm.c | 2 -- src/pcm/pcm_meter.c | 2 +- 11 files changed, 15 insertions(+), 17 deletions(-) diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg index 861ca6cc..cb8c0a6a 100644 --- a/doc/doxygen.cfg +++ b/doc/doxygen.cfg @@ -26,6 +26,7 @@ QUIET = YES EXTRACT_ALL = NO EXTRACT_STATIC = NO +SHOW_INCLUDE_FILES = NO JAVADOC_AUTOBRIEF = NO INHERIT_DOCS = YES ENABLED_SECTIONS = "" diff --git a/include/local.h b/include/local.h index 46eed27f..6959f13d 100644 --- a/include/local.h +++ b/include/local.h @@ -22,6 +22,7 @@ #ifndef __LOCAL_H #define __LOCAL_H +#define _snd_config_iterator list_head #define _snd_interval sndrv_interval #define _snd_pcm_info sndrv_pcm_info #define _snd_pcm_hw_params sndrv_pcm_hw_params diff --git a/src/conf.c b/src/conf.c index 49c26f65..9fcea6c5 100644 --- a/src/conf.c +++ b/src/conf.c @@ -19,14 +19,13 @@ * */ -#ifndef DOC_HIDDEN -#define _snd_config_iterator list_head - #include #include #include "local.h" #include "list.h" +#ifndef DOC_HIDDEN + struct _snd_config { char *id; snd_config_type_t type; diff --git a/src/control/control.c b/src/control/control.c index 11a68daa..5b0e4b02 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -26,7 +26,6 @@ * */ -#ifndef DOC_HIDDEN #include #include #include @@ -37,7 +36,6 @@ #include #include #include "control_local.h" -#endif /** * \brief get identifier of CTL handle diff --git a/src/control/hcontrol.c b/src/control/hcontrol.c index dcaa3392..6ddfa8d1 100644 --- a/src/control/hcontrol.c +++ b/src/control/hcontrol.c @@ -29,7 +29,6 @@ * */ -#ifndef DOC_HIDDEN #include #include #include @@ -44,8 +43,6 @@ static int snd_hctl_compare_default(const snd_hctl_elem_t *c1, const snd_hctl_elem_t *c2); -#endif - /** * \brief Opens an HCTL * \param hctlp Returned HCTL handle diff --git a/src/input.c b/src/input.c index 7832fb3c..65da32c2 100644 --- a/src/input.c +++ b/src/input.c @@ -26,13 +26,14 @@ * */ -#ifndef DOC_HIDDEN #include #include #include #include #include "local.h" +#ifndef DOC_HIDDEN + typedef struct _snd_input_ops { int (*close)(snd_input_t *input); int (*scanf)(snd_input_t *input, const char *format, va_list args); diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c index 9efbaa49..a28c2de2 100644 --- a/src/mixer/mixer.c +++ b/src/mixer/mixer.c @@ -29,7 +29,6 @@ * */ -#ifndef DOC_HIDDEN #include #include #include @@ -38,6 +37,7 @@ #include #include "mixer_local.h" +#ifndef DOC_HIDDEN typedef struct _snd_mixer_slave { snd_hctl_t *hctl; struct list_head list; diff --git a/src/mixer/simple.c b/src/mixer/simple.c index d3e3f932..95cc02fe 100644 --- a/src/mixer/simple.c +++ b/src/mixer/simple.c @@ -28,7 +28,6 @@ * */ -#ifndef DOC_HIDDEN #include #include #include @@ -38,6 +37,8 @@ #include #include "mixer_local.h" +#ifndef DOC_HIDDEN + #define CAP_GVOLUME (1<<1) #define CAP_GSWITCH (1<<2) #define CAP_PVOLUME (1<<3) @@ -92,8 +93,6 @@ typedef struct _selem { } str[2]; } selem_t; -#endif - static struct mixer_name_table { const char *longname; const char *shortname; @@ -105,6 +104,8 @@ static struct mixer_name_table { {0, 0}, }; +#endif + static const char *get_short_name(const char *lname) { struct mixer_name_table *p; @@ -626,6 +627,7 @@ static int simple_update(snd_mixer_elem_t *melem) return 0; } +#ifndef DOC_HIDDEN static struct suf { const char *suffix; selem_ctl_type_t type; @@ -641,6 +643,7 @@ static struct suf { {" Volume", CTL_GLOBAL_VOLUME}, {NULL, 0} }; +#endif /* Return base length or 0 on failure */ static int base_len(const char *name, selem_ctl_type_t *type) diff --git a/src/output.c b/src/output.c index ed73a416..042e7ec9 100644 --- a/src/output.c +++ b/src/output.c @@ -26,13 +26,13 @@ * */ -#ifndef DOC_HIDDEN #include #include #include #include #include "local.h" +#ifndef DOC_HIDDEN typedef struct _snd_output_ops { int (*close)(snd_output_t *output); int (*printf)(snd_output_t *output, const char *format, va_list args); diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index db866044..32872ec3 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -32,7 +32,6 @@ * */ -#ifndef DOC_HIDDEN #include #include #include @@ -46,7 +45,6 @@ #include #include "pcm_local.h" #include "list.h" -#endif /** * \brief get identifier of PCM handle diff --git a/src/pcm/pcm_meter.c b/src/pcm/pcm_meter.c index 679bebd6..3a7c737f 100644 --- a/src/pcm/pcm_meter.c +++ b/src/pcm/pcm_meter.c @@ -25,7 +25,6 @@ * */ -#ifndef DOC_HIDDEN #include #include @@ -36,6 +35,7 @@ #include "pcm_local.h" #include "pcm_plugin.h" +#ifndef DOC_HIDDEN #define FREQUENCY 50 struct _snd_pcm_scope { -- 2.47.1