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 /stream/stream.c | |
| 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 'stream/stream.c')
| -rw-r--r-- | stream/stream.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/stream/stream.c b/stream/stream.c index 186fc7c79d..fbc324563a 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -80,34 +80,34 @@ extern const stream_info_t stream_info_rar_filter; extern const stream_info_t stream_info_rar_entry; static const stream_info_t *const stream_list[] = { -#ifdef CONFIG_VCD +#if HAVE_VCD &stream_info_vcd, #endif -#ifdef CONFIG_CDDA +#if HAVE_CDDA &stream_info_cdda, #endif &stream_info_ffmpeg, &stream_info_avdevice, -#ifdef CONFIG_DVBIN +#if HAVE_DVBIN &stream_info_dvb, #endif -#ifdef CONFIG_TV +#if HAVE_TV &stream_info_tv, #endif -#ifdef CONFIG_RADIO +#if HAVE_RADIO &stream_info_radio, #endif -#ifdef CONFIG_PVR +#if HAVE_PVR &stream_info_pvr, #endif -#ifdef CONFIG_LIBSMBCLIENT +#if HAVE_LIBSMBCLIENT &stream_info_smb, #endif -#ifdef CONFIG_DVDREAD +#if HAVE_DVDREAD &stream_info_ifo, &stream_info_dvd, #endif -#ifdef CONFIG_LIBBLURAY +#if HAVE_LIBBLURAY &stream_info_bluray, #endif @@ -804,7 +804,7 @@ static int stream_enable_cache(stream_t **stream, int64_t size, int64_t min, int res = -1; -#ifdef CONFIG_STREAM_CACHE +#if HAVE_STREAM_CACHE res = stream_cache_init(cache, orig, size, min, seek_limit); #endif |