Documentation generation fixes

diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg
index 861ca6cca6521767f9d1ed5ec311f1bbc4eefc1d..cb8c0a6ae4287f9658f8d77db31c89174f6cb58e 100644 (file)
--- 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 46eed27ff582e24c077fdff694b905926cc2d002..6959f13d55019d73ec64898137a017fbf3167785 100644 (file)
--- 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 49c26f6583a36ab1f54f11d29a1983578814eb3f..9fcea6c5459c89a07d3fdf12b14d866e0eea54e9 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,14 +19,13 @@
  *
  */
 
-#ifndef DOC_HIDDEN
-#define _snd_config_iterator list_head
-
 #include <stdarg.h>
 #include <sys/stat.h>
 #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 11a68daa8f7e52ef817e4c4755b7ff2505f1396e..5b0e4b023cbd72ed0c77f444ff0fc5b728f6d50b 100644 (file)
--- a/src/control/control.c
+++ b/src/control/control.c
@@ -26,7 +26,6 @@
  *
  */
 
-#ifndef DOC_HIDDEN
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -37,7 +36,6 @@
 #include <signal.h>
 #include <sys/poll.h>
 #include "control_local.h"
-#endif
 
 /**
  * \brief get identifier of CTL handle

diff --git a/src/control/hcontrol.c b/src/control/hcontrol.c
index dcaa33927d48d70b05f0807bd2d21e5081dc8d4a..6ddfa8d183b27a57293cd454484e06b153c7a79c 100644 (file)
--- a/src/control/hcontrol.c
+++ b/src/control/hcontrol.c
@@ -29,7 +29,6 @@
  *
  */
 
-#ifndef DOC_HIDDEN  
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -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 7832fb3c5270e72b72d4c15102e93a77185ff049..65da32c235302c6e3f5010e85f423c314b5c99af 100644 (file)
--- a/src/input.c
+++ b/src/input.c
@@ -26,13 +26,14 @@
  *
  */
 
-#ifndef DOC_HIDDEN
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #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 9efbaa492d9fa97b42363cf62280e52ec17930b0..a28c2de2f84d5933a2e1c3191c74bbcdcc9e536b 100644 (file)
--- a/src/mixer/mixer.c
+++ b/src/mixer/mixer.c
@@ -29,7 +29,6 @@
  *
  */
 
-#ifndef DOC_HIDDEN
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -38,6 +37,7 @@
 #include <sys/ioctl.h>
 #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 d3e3f932f26389c5174f7bdd501a22fd21f1c5c7..95cc02feea6efcbc913e38f42ffffe6c4407e373 100644 (file)
--- a/src/mixer/simple.c
+++ b/src/mixer/simple.c
@@ -28,7 +28,6 @@
  *
  */
 
-#ifndef DOC_HIDDEN
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -38,6 +37,8 @@
 #include <math.h>
 #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 ed73a4166872797c3c1ffa3bd6dca6b3c2ca6db3..042e7ec924b196c3fdfa65303a9507786537a088 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -26,13 +26,13 @@
  *
  */
 
-#ifndef DOC_HIDDEN
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #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 db866044928a15eff6959c403a32e0686198654c..32872ec335b1c67168ec6b92b9d06c43d72b9842 100644 (file)
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -32,7 +32,6 @@
  *
  */
 
-#ifndef DOC_HIDDEN  
 #include <stdio.h>
 #include <string.h>
 #include <malloc.h>
@@ -46,7 +45,6 @@
 #include <dlfcn.h>
 #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 679bebd658624bd0e6d3e4662fbc9c556d2923ba..3a7c737f97d859d9b7cc2d22bf4c7b5e385bd3df 100644 (file)
--- a/src/pcm/pcm_meter.c
+++ b/src/pcm/pcm_meter.c
@@ -25,7 +25,6 @@
  *
  */
   
-#ifndef DOC_HIDDEN
 
 #include <byteswap.h>
 #include <time.h>
@@ -36,6 +35,7 @@
 #include "pcm_local.h"
 #include "pcm_plugin.h"
 
+#ifndef DOC_HIDDEN
 #define FREQUENCY 50
 
 struct _snd_pcm_scope {