From 37388ebb0ef9085c841d7f94e665a5a77cfe0e92 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
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/out/ao.c     | 26 +++++++++++++-------------
 audio/out/ao_oss.c | 10 +++++-----
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'audio/out')

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;
-- 
cgit v1.2.3