doxygen: Expand all macros, in particular config.h.

This improves the generated documentation web pages since now all
HAVE_XXX macros of config.h are taken into account.

diff --git a/Doxyfile b/Doxyfile
index 04d8f32621edd1426e2651aab711dd11516d9080..00cb6cc905af69531136fbf06b03e9ee1052b072 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -622,7 +622,6 @@ EXCLUDE_PATTERNS       = *.cmdline.* \
                          gui* \
                          gcc-compat.h \
                          fade.c \
-                         config.h \
                        *_command_list.h \
                        *_completion.h
 
@@ -1267,7 +1266,7 @@ ENABLE_PREPROCESSING   = YES
 # compilation will be performed. Macro expansion can be done in a controlled
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
 # then the macro expansion is limited to the macros specified with the
@@ -1301,13 +1300,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator
 # instead of the = operator.
 
-PREDEFINED             = HAVE_MAD \
-                         HAVE_FAAD \
-                         HAVE_OGGVORBIS \
-                         __GNUC__=4 \
-                         __GNUC_MINOR__=4 \
-                         HAVE_UCRED \
-                        HAVE_CLOCK_GETTIME
+PREDEFINED             = __GNUC__=4 __GNUC_MINOR__=4
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.

diff --git a/imdct.c b/imdct.c
index aab498a390ba3ecdeded2452120d729540e84184..93393e9959edb611e32b92c41a8c09c61e3af55e 100644 (file)
--- a/imdct.c
+++ b/imdct.c
@@ -58,7 +58,9 @@ struct mdct_context {
        struct fft_context fft;
 };
 
-/** cos(2 * pi * x / n) for 0 <= x <= n / 4, followed by its reverse */
+/** \cond cosine_tabs */
+
+/* cos(2 * pi * x / n) for 0 <= x <= n / 4, followed by its reverse */
 #define COSINE_TAB(n) static fftsample_t cos_ ## n[n / 2] __a_aligned(16)
 
 COSINE_TAB(16);
@@ -79,6 +81,7 @@ static fftsample_t *cos_tabs[] = {
        cos_16, cos_32, cos_64, cos_128, cos_256, cos_512, cos_1024, cos_2048,
        cos_4096, cos_8192, cos_16384, cos_32768, cos_65536,
 };
+/** \endcond cosine_tabs */
 
 __a_const static int split_radix_permutation(int i, int n)
 {

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 8b751f04592eff0f7d6b3e5fe73ade1938c17382..0071337f38427cc98f341404a6819ee683352ecc 100644 (file)
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -149,6 +149,8 @@ struct private_wmadec_data {
 #define VLCBITS 9
 #define VLCMAX DIV_ROUND_UP(22, VLCBITS)
 
+/** \cond sine_winows */
+
 #define SINE_WINDOW(x) static float sine_ ## x[x] __a_aligned(16)
 
 SINE_WINDOW(128);
@@ -161,6 +163,7 @@ SINE_WINDOW(4096);
 static float *sine_windows[6] = {
        sine_128, sine_256, sine_512, sine_1024, sine_2048, sine_4096
 };
+/** \endcond sine_windows */
 
 /* Generate a sine window. */
 static void sine_window_init(float *window, int n)