Merge branch 'master' into next

[paraslash.git] / filter.h

diff --git a/filter.h b/filter.h
index 2d1c150afdda6add9bb498c625889fdcbdda5ea3..2a75b1864dd49348a50087c5aa7e4aa1e6edb453 100644 (file)
--- a/filter.h
+++ b/filter.h
@@ -6,6 +6,8 @@
 
 /** \file filter.h Filter-related structures and exported symbols from filter_chain.c. */
 
 
 /** \file filter.h Filter-related structures and exported symbols from filter_chain.c. */
 

+/** The list of supported filters. */
+enum filter_enum {FILTER_ENUM};

 
 /**
  * Describes one running instance of a filter.
 
 /**
  * Describes one running instance of a filter.


@@ -220,55 +222,9 @@ static inline void write_int16_host_endian(char *buf, int val)
 #endif
 }
 
 #endif
 }
 

+DECLARE_FILTER_INITS

 
 

-/** \cond */
-extern struct filter filters[];
-#define DECLARE_EXTERN_FILTER_INIT(name) \
-       extern void name ## _init(struct filter *f)
-
-#define FILTER_INIT(filter) { \
-       .name = #filter, \
-       .init = filter ## _init, \
-       .parse_config = NULL, \
-       .print_help = NULL \
-},
-
-/* filters that are always present */
-DECLARE_EXTERN_FILTER_INIT(wav);
-DECLARE_EXTERN_FILTER_INIT(compress);
-DECLARE_EXTERN_FILTER_INIT(amp);
-
-/* next the optional filters */
-#ifdef HAVE_MAD
-DECLARE_EXTERN_FILTER_INIT(mp3dec);
-#define MP3DEC_FILTER FILTER_INIT(mp3dec)
-#else
-#define MP3DEC_FILTER
-#endif
-
-#ifdef HAVE_FAAD
-DECLARE_EXTERN_FILTER_INIT(aacdec);
-#define AACDEC_FILTER FILTER_INIT(aacdec)
-#else
-#define AACDEC_FILTER
-#endif
-
-#ifdef HAVE_OGGVORBIS
-DECLARE_EXTERN_FILTER_INIT(oggdec);
-#define OGGDEC_FILTER FILTER_INIT(oggdec)
-#else
-#define OGGDEC_FILTER
-#endif
-/** \endcond */
-
-/** define an array of all available filters */
-#define DEFINE_FILTER_ARRAY(filters) struct filter filters[] = { \
-       FILTER_INIT(wav) \
-       FILTER_INIT(compress) \
-       FILTER_INIT(amp) \
-       MP3DEC_FILTER \
-       AACDEC_FILTER \
-       OGGDEC_FILTER \
-       { .name = NULL } };
-
+#define FOR_EACH_SUPPORTED_FILTER(j)  for (j = 0; j < NUM_SUPPORTED_FILTERS; j++)

 
 

+/** The filter array, one structure for each supported filter. */
+extern struct filter filters[NUM_SUPPORTED_FILTERS];