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.
---
 Makefile           |  1 +
 configure          | 23 +++++++++++++++++++++++
 libao2/audio_out.c | 12 ++++++------
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 26b6178b17..016f256635 100644
--- a/Makefile
+++ b/Makefile
@@ -233,6 +233,7 @@ SRCS_MPLAYER-$(CACA)         += libvo/vo_caca.c
 SRCS_MPLAYER-$(COREAUDIO)    += libao2/ao_coreaudio.c
 SRCS_MPLAYER-$(COREVIDEO)    += libvo/vo_corevideo.m
 SRCS_MPLAYER-$(DIRECT3D)     += libvo/vo_direct3d.c libvo/w32_common.c
+SRCS_MPLAYER-$(DSOUND)       += libao2/ao_dsound.c
 SRCS_MPLAYER-$(GL)           += libvo/gl_common.c libvo/vo_opengl.c \
                                 libvo/vo_opengl_old.c pnm_loader.c
 SRCS_MPLAYER-$(ENCODING)     += libvo/vo_lavc.c libao2/ao_lavc.c encode_lavc.c
diff --git a/configure b/configure
index 7e02acc877..3b1a174ad9 100755
--- a/configure
+++ b/configure
@@ -375,6 +375,7 @@ Audio output:
   --disable-jack         disable JACK audio output [autodetect]
   --enable-openal        enable OpenAL audio output [disable]
   --disable-coreaudio    disable CoreAudio audio output [autodetect]
+  --disable-dsound        disable DirectSound audio output [autodetect]
   --disable-select       disable using select() on the audio device [enable]
 
 Language options:
@@ -443,6 +444,7 @@ _xss=auto
 _xv=auto
 _vdpau=auto
 _direct3d=auto
+_dsound=auto
 _nas=auto
 _png=auto
 _mng=auto
@@ -635,6 +637,8 @@ for ac_option do
   --disable-vdpau)      _vdpau=no       ;;
   --enable-direct3d)    _direct3d=yes   ;;
   --disable-direct3d)   _direct3d=no    ;;
+  --enable-dsound)      _dsound=yes     ;;
+  --disable-dsound)     _dsound=no      ;;
   --enable-png)         _png=yes        ;;
   --disable-png)        _png=no         ;;
   --enable-mng)         _mng=yes        ;;
@@ -2478,6 +2482,7 @@ echores "$_gl"
 
 if win32; then
 
+
 echocheck "Direct3D"
 if test "$_direct3d" = auto ; then
   _direct3d=no
@@ -2492,6 +2497,22 @@ else
 fi
 echores "$_direct3d"
 
+
+echocheck "DirectSound"
+if test "$_dsound" = auto ; then
+  _dsound=no
+  header_check dsound.h && _dsound=yes
+fi
+if test "$_dsound" = yes ; then
+  def_dsound='#define CONFIG_DSOUND 1'
+  aomodules="dsound $aomodules"
+else
+  def_dsound='#undef CONFIG_DSOUND'
+  noaomodules="dsound $noaomodules"
+fi
+echores "$_dsound"
+
+
 fi #if win32; then
 
 
@@ -3339,6 +3360,7 @@ COCOA = $_cocoa
 COREAUDIO = $_coreaudio
 COREVIDEO = $_corevideo
 DIRECT3D = $_direct3d
+DSOUND = $_dsound
 DVBIN = $_dvbin
 DVDREAD = $_dvdread
 DXR3 = $_dxr3
@@ -3583,6 +3605,7 @@ $def_caca
 $def_corevideo
 $def_cocoa
 $def_direct3d
+$def_dsound
 $def_dvb
 $def_dvbin
 $def_gif
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