Documentation generation fixes

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 = ""

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

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;

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

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

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);

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;

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)

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);

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

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 {