[alsa-cvslog] alsa-lib: Fix examples for PCM API. Fix dogygen warnings.

[Jaroslav K. <pe...@su...>]

changeset:   2168:d114f217fa2101cf298400c23f6a3aebf59afc10
tag:         tip
user:        perex
date:        Tue Jul 11 21:48:51 2006 +0200
files:       doc/doxygen.cfg src/control/hcontrol.c src/pcm/pcm.c src/pcm/pcm_rate.c
description:
Fix examples for PCM API. Fix dogygen warnings.


diff -r 36c9ef1a7f5b3eac4a491491f4bd5ddbfae6fa88 -r d114f217fa2101cf298400c23f6a3aebf59afc10 doc/doxygen.cfg
--- a/doc/doxygen.cfg	Wed Jul 05 17:42:16 2006 +0200
+++ b/doc/doxygen.cfg	Tue Jul 11 21:48:51 2006 +0200
@@ -94,8 +94,7 @@ EXCLUDE		 = ../src/control/control_local
 		   ../src/seq/seq_local.h
 RECURSIVE	 = YES
 FILE_PATTERNS    = *.c *.h
-EXAMPLE_PATH     = ../test/pcm.c ../test/latency.c ../test/rawmidi.c \
-		   ../test/timer.c
+EXAMPLE_PATH     = ../test
 IMAGE_PATH	 = pictures
 QUIET            = YES
 
diff -r 36c9ef1a7f5b3eac4a491491f4bd5ddbfae6fa88 -r d114f217fa2101cf298400c23f6a3aebf59afc10 src/control/hcontrol.c
--- a/src/control/hcontrol.c	Wed Jul 05 17:42:16 2006 +0200
+++ b/src/control/hcontrol.c	Tue Jul 11 21:48:51 2006 +0200
@@ -822,7 +822,7 @@ int snd_hctl_elem_read(snd_hctl_elem_t *
  * \param elem HCTL element
  * \param value HCTL element value
  * \retval 0 on success
- * \ratval >1 on success when value was changed
+ * \retval >1 on success when value was changed
  * \retval <0 a negative error code on failure
  */
 int snd_hctl_elem_write(snd_hctl_elem_t *elem, snd_ctl_elem_value_t * value)
@@ -854,7 +854,7 @@ int snd_hctl_elem_tlv_read(snd_hctl_elem
  * \param elem HCTL element
  * \param tlv TLV array for value
  * \retval 0 on success
- * \ratval >1 on success when value was changed
+ * \retval >1 on success when value was changed
  * \retval <0 a negative error code on failure
  */
 int snd_hctl_elem_tlv_write(snd_hctl_elem_t *elem, const unsigned int *tlv)
@@ -870,7 +870,7 @@ int snd_hctl_elem_tlv_write(snd_hctl_ele
  * \param elem HCTL element
  * \param tlv TLV array for value
  * \retval 0 on success
- * \ratval >1 on success when value was changed
+ * \retval >1 on success when value was changed
  * \retval <0 a negative error code on failure
  */
 int snd_hctl_elem_tlv_command(snd_hctl_elem_t *elem, const unsigned int *tlv)
diff -r 36c9ef1a7f5b3eac4a491491f4bd5ddbfae6fa88 -r d114f217fa2101cf298400c23f6a3aebf59afc10 src/pcm/pcm.c
--- a/src/pcm/pcm.c	Wed Jul 05 17:42:16 2006 +0200
+++ b/src/pcm/pcm.c	Tue Jul 11 21:48:51 2006 +0200
@@ -600,39 +600,34 @@ The null device is null plugin. This dev
 
 \section pcm_examples Examples
 
-The full featured examples with cross-links:
-
+The full featured examples with cross-links can be found in Examples section
+(see top of page):
+
+\anchor example_test_pcm
 \par Sine-wave generator
-\ref example_test_pcm "example code"
 \par
-This example shows various transfer methods for the playback direction.
+alsa-lib/test/pcm.c example shows various transfer methods for the playback direction.
 
 \par Minimalistic PCM playback code
-\ref example_test_pcm_min "example code"
 \par
-This example shows the minimal code to produce a sound.
+alsa-lib/test/pcm_min.c example shows the minimal code to produce a sound.
 
 \par Latency measuring tool
-\ref example_test_latency "example code"
 \par
-This example shows the measuring of minimal latency between capture and
+alsa-lib/test/latency.c example shows the measuring of minimal latency between capture and
 playback devices.
 
 */
 
 /**
- * \example ../test/pcm.c
- * \anchor example_test_pcm
- */
-/**
- * \example ../test/pcm_min.c
- * \anchor example_test_pcm_min
- */
-/**
- * \example ../test/latency.c
- * \anchor example_test_latency
- */
-
+\example ../../test/pcm.c
+*/
+/**
+\example ../../test/pcm_min.c
+*/
+/**
+\example ../../test/latency.c
+*/
 
 #include <stdio.h>
 #include <string.h>
diff -r 36c9ef1a7f5b3eac4a491491f4bd5ddbfae6fa88 -r d114f217fa2101cf298400c23f6a3aebf59afc10 src/pcm/pcm_rate.c
--- a/src/pcm/pcm_rate.c	Wed Jul 05 17:42:16 2006 +0200
+++ b/src/pcm/pcm_rate.c	Tue Jul 11 21:48:51 2006 +0200
@@ -419,9 +419,11 @@ static void convert_to_s16(snd_pcm_rate_
 			   snd_pcm_uframes_t offset, unsigned int frames,
 			   unsigned int channels)
 {
+#ifndef DOC_HIDDEN
 #define GET16_LABELS
 #include "plugin_ops.h"
 #undef GET16_LABELS
+#endif /* DOC_HIDDEN */
 	void *get = get16_labels[rate->get_idx];
 	const char *src;
 	int16_t sample;
@@ -438,9 +440,11 @@ static void convert_to_s16(snd_pcm_rate_
 		for (c = 0; c < channels; c++) {
 			src = srcs[c];
 			goto *get;
+#ifndef DOC_HIDDEN
 #define GET16_END after_get
 #include "plugin_ops.h"
 #undef GET16_END
+#endif /* DOC_HIDDEN */
 		after_get:
 			*buf++ = sample;
 			srcs[c] += src_step[c];
@@ -453,9 +457,11 @@ static void convert_from_s16(snd_pcm_rat
 			     snd_pcm_uframes_t offset, unsigned int frames,
 			     unsigned int channels)
 {
+#ifndef DOC_HIDDEN
 #define PUT16_LABELS
 #include "plugin_ops.h"
 #undef PUT16_LABELS
+#endif /* DOC_HIDDEN */
 	void *put = put16_labels[rate->put_idx];
 	char *dst;
 	int16_t sample;
@@ -473,9 +479,11 @@ static void convert_from_s16(snd_pcm_rat
 			dst = dsts[c];
 			sample = *buf++;
 			goto *put;
+#ifndef DOC_HIDDEN
 #define PUT16_END after_put
 #include "plugin_ops.h"
 #undef PUT16_END
+#endif /* DOC_HIDDEN */
 		after_put:
 			dsts[c] += dst_step[c];
 		}