From 37388ebb0ef9085c841d7f94e665a5a77cfe0e92 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 16 Jul 2013 13:28:28 +0200 Subject: configure: uniform the defines to #define HAVE_xxx (0|1) The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related --- audio/filter/af_lavrresample.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'audio/filter/af_lavrresample.c') diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c index 0c2d20b8aa..f1017d62c6 100644 --- a/audio/filter/af_lavrresample.c +++ b/audio/filter/af_lavrresample.c @@ -33,10 +33,10 @@ #include "talloc.h" #include "config.h" -#if defined(CONFIG_LIBAVRESAMPLE) +#if HAVE_LIBAVRESAMPLE #include #define USE_SET_CHANNEL_MAPPING HAVE_AVRESAMPLE_SET_CHANNEL_MAPPING -#elif defined(CONFIG_LIBSWRESAMPLE) +#elif HAVE_LIBSWRESAMPLE #include #define AVAudioResampleContext SwrContext #define avresample_alloc_context swr_alloc @@ -49,7 +49,7 @@ #define avresample_set_channel_mapping swr_set_channel_mapping #define USE_SET_CHANNEL_MAPPING 1 #else -#error "config.h broken" +#error "config.h broken or no resampler found" #endif #include "mpvcore/mp_msg.h" @@ -86,7 +86,7 @@ struct af_resample { uint8_t *reorder_buffer; }; -#ifdef CONFIG_LIBAVRESAMPLE +#if HAVE_LIBAVRESAMPLE static int get_delay(struct af_resample *s) { return avresample_get_delay(s->avrctx); -- cgit v1.2.3