summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-07-16 13:28:28 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-11-03 21:59:54 +0100
commit37388ebb0ef9085c841d7f94e665a5a77cfe0e92 (patch)
treeb47d18bee4e7f661d9e6d794dac0ec1cebcd3a37 /audio
parent891a2a1f474add323145e6b2cd2d29181830e4a4 (diff)
downloadmpv-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')
-rw-r--r--audio/decode/dec_audio.c2
-rw-r--r--audio/filter/af.c8
-rw-r--r--audio/filter/af_lavrresample.c8
-rw-r--r--audio/out/ao.c26
-rw-r--r--audio/out/ao_oss.c10
5 files changed, 27 insertions, 27 deletions
diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c
index c368350f71..b9ca71692f 100644
--- a/audio/decode/dec_audio.c
+++ b/audio/decode/dec_audio.c
@@ -46,7 +46,7 @@ extern const struct ad_functions ad_lavc;
extern const struct ad_functions ad_spdif;
static const struct ad_functions * const ad_drivers[] = {
-#ifdef CONFIG_MPG123
+#if HAVE_MPG123
&ad_mpg123,
#endif
&ad_lavc,
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);
diff --git a/audio/out/ao.c b/audio/out/ao.c
index c21e58ccf6..3f0865af22 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -50,47 +50,47 @@ extern const struct ao_driver audio_out_sdl;
static const struct ao_driver * const audio_out_drivers[] = {
// native:
-#ifdef CONFIG_COREAUDIO
+#if HAVE_COREAUDIO
&audio_out_coreaudio,
#endif
-#ifdef CONFIG_PULSE
+#if HAVE_PULSE
&audio_out_pulse,
#endif
-#ifdef CONFIG_SNDIO
+#if HAVE_SNDIO
&audio_out_sndio,
#endif
-#ifdef CONFIG_ALSA
+#if HAVE_ALSA
&audio_out_alsa,
#endif
-#ifdef CONFIG_WASAPI
+#if HAVE_WASAPI
&audio_out_wasapi,
#endif
-#ifdef CONFIG_OSS_AUDIO
+#if HAVE_OSS_AUDIO
&audio_out_oss,
#endif
-#ifdef CONFIG_DSOUND
+#if HAVE_DSOUND
&audio_out_dsound,
#endif
-#ifdef CONFIG_PORTAUDIO
+#if HAVE_PORTAUDIO
&audio_out_portaudio,
#endif
// wrappers:
-#ifdef CONFIG_JACK
+#if HAVE_JACK
&audio_out_jack,
#endif
-#ifdef CONFIG_OPENAL
+#if HAVE_OPENAL
&audio_out_openal,
#endif
-#ifdef CONFIG_SDL
+#if HAVE_SDL || HAVE_SDL2
&audio_out_sdl,
#endif
&audio_out_null,
// should not be auto-selected:
&audio_out_pcm,
-#ifdef CONFIG_ENCODING
+#if HAVE_ENCODING
&audio_out_lavc,
#endif
-#ifdef CONFIG_RSOUND
+#if HAVE_RSOUND
&audio_out_rsound,
#endif
NULL
diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c
index ed1b9468ef..c22d15211f 100644
--- a/audio/out/ao_oss.c
+++ b/audio/out/ao_oss.c
@@ -38,10 +38,10 @@
#include "mpvcore/options.h"
#include "mpvcore/mp_msg.h"
-#ifdef HAVE_SYS_SOUNDCARD_H
+#if HAVE_SYS_SOUNDCARD_H
#include <sys/soundcard.h>
#else
-#ifdef HAVE_SOUNDCARD_H
+#if HAVE_SOUNDCARD_H
#include <soundcard.h>
#endif
#endif
@@ -349,7 +349,7 @@ ac3_retry:
// Measuring buffer size:
void *data;
p->buffersize = 0;
-#ifdef HAVE_AUDIO_SELECT
+#if HAVE_AUDIO_SELECT
data = malloc(p->outburst);
memset(data, 0, p->outburst);
while (p->buffersize < 0x40000) {
@@ -367,7 +367,7 @@ ac3_retry:
free(data);
if (p->buffersize == 0) {
MP_ERR(ao, "*** Your audio driver DOES NOT support select() ***\n");
- MP_ERR(ao, "Recompile mpv with #undef HAVE_AUDIO_SELECT in config.h!\n");
+ MP_ERR(ao, "Recompile mpv with #define HAVE_AUDIO_SELECT 0 in config.h!\n");
return -1;
}
#endif
@@ -456,7 +456,7 @@ static int get_space(struct ao *ao)
#endif
// check buffer
-#ifdef HAVE_AUDIO_SELECT
+#if HAVE_AUDIO_SELECT
{
fd_set rfds;
struct timeval tv;