diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-07-16 13:28:28 +0200 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-11-03 21:59:54 +0100 |
| commit | 37388ebb0ef9085c841d7f94e665a5a77cfe0e92 (patch) | |
| tree | b47d18bee4e7f661d9e6d794dac0ec1cebcd3a37 /audio/filter | |
| parent | 891a2a1f474add323145e6b2cd2d29181830e4a4 (diff) | |
| download | mpv-37388ebb0ef9085c841d7f94e665a5a77cfe0e92.tar.bz2 mpv-37388ebb0ef9085c841d7f94e665a5a77cfe0e92.tar.xz | |
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
Diffstat (limited to 'audio/filter')
| -rw-r--r-- | audio/filter/af.c | 8 | ||||
| -rw-r--r-- | audio/filter/af_lavrresample.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/audio/filter/af.c b/audio/filter/af.c index c981a41288..f425cb40e3 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -65,7 +65,7 @@ static struct af_info* filter_list[] = { &af_info_pan, &af_info_surround, &af_info_sub, -#ifdef HAVE_SYS_MMAN_H +#if HAVE_SYS_MMAN_H &af_info_export, #endif &af_info_drc, @@ -74,17 +74,17 @@ static struct af_info* filter_list[] = { &af_info_lavrresample, &af_info_sweep, &af_info_hrtf, -#ifdef CONFIG_LADSPA +#if HAVE_LADSPA &af_info_ladspa, #endif &af_info_center, &af_info_sinesuppress, &af_info_karaoke, &af_info_scaletempo, -#ifdef CONFIG_LIBBS2B +#if HAVE_LIBBS2B &af_info_bs2b, #endif -#ifdef CONFIG_AF_LAVFI +#if HAVE_AF_LAVFI &af_info_lavfi, #endif // Must come last, because they're fallback format conversion filter 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 <libavresample/avresample.h> #define USE_SET_CHANNEL_MAPPING HAVE_AVRESAMPLE_SET_CHANNEL_MAPPING -#elif defined(CONFIG_LIBSWRESAMPLE) +#elif HAVE_LIBSWRESAMPLE #include <libswresample/swresample.h> #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); |