From abc0ab8f618afe9474d580c3d7f496e487c0e32d Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 5 Oct 2012 15:17:16 +0200
Subject: build: fix ao_dsound config checks

ao_dsound.c depended on the same configure check as vo_directx.c, which
was removed in commit 0e2c48a3ce19. This accidentally disabled
inclusion of ao_dsound.

Fix it by adding a new check. Also, move it below ao_portaudio on the
auto-select list, as ao_dsound is considered deprecated.

Unrelated to that, move ao_lavc below ao_null to prevent it from being
auto-selected.
---
 libao2/audio_out.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'libao2')

diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 47c18655f3..ab8e60b753 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -48,9 +48,6 @@ extern const struct ao_driver audio_out_portaudio;
 
 static const struct ao_driver * const audio_out_drivers[] = {
 // native:
-#ifdef CONFIG_DIRECTX
-    &audio_out_dsound,
-#endif
 #ifdef CONFIG_COREAUDIO
     &audio_out_coreaudio,
 #endif
@@ -65,6 +62,9 @@ static const struct ao_driver * const audio_out_drivers[] = {
 #endif
 #ifdef CONFIG_PORTAUDIO
     &audio_out_portaudio,
+#endif
+#ifdef CONFIG_DSOUND
+    &audio_out_dsound,
 #endif
     // wrappers:
 #ifdef CONFIG_JACK
@@ -72,13 +72,13 @@ static const struct ao_driver * const audio_out_drivers[] = {
 #endif
 #ifdef CONFIG_OPENAL
     &audio_out_openal,
-#endif
-#ifdef CONFIG_ENCODING
-    &audio_out_lavc,
 #endif
     &audio_out_null,
     // should not be auto-selected:
     &audio_out_pcm,
+#ifdef CONFIG_ENCODING
+    &audio_out_lavc,
+#endif
 #ifdef CONFIG_RSOUND
     &audio_out_rsound,
 #endif
-- 
cgit v1.2.3