build: fix ao_dsound config checks

ao_dsound.c depended on the same configure check as vo_directx.c, which
was removed in commit 0e2c48a3ce. 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.
This commit is contained in:
wm4 2012-10-05 15:17:16 +02:00
parent bc97dab886
commit abc0ab8f61
3 changed files with 30 additions and 6 deletions

View File

@ -233,6 +233,7 @@ SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c
SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c
SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m
SRCS_MPLAYER-$(DIRECT3D) += libvo/vo_direct3d.c libvo/w32_common.c 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 \ SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_opengl.c \
libvo/vo_opengl_old.c pnm_loader.c libvo/vo_opengl_old.c pnm_loader.c
SRCS_MPLAYER-$(ENCODING) += libvo/vo_lavc.c libao2/ao_lavc.c encode_lavc.c SRCS_MPLAYER-$(ENCODING) += libvo/vo_lavc.c libao2/ao_lavc.c encode_lavc.c

23
configure vendored
View File

@ -375,6 +375,7 @@ Audio output:
--disable-jack disable JACK audio output [autodetect] --disable-jack disable JACK audio output [autodetect]
--enable-openal enable OpenAL audio output [disable] --enable-openal enable OpenAL audio output [disable]
--disable-coreaudio disable CoreAudio audio output [autodetect] --disable-coreaudio disable CoreAudio audio output [autodetect]
--disable-dsound disable DirectSound audio output [autodetect]
--disable-select disable using select() on the audio device [enable] --disable-select disable using select() on the audio device [enable]
Language options: Language options:
@ -443,6 +444,7 @@ _xss=auto
_xv=auto _xv=auto
_vdpau=auto _vdpau=auto
_direct3d=auto _direct3d=auto
_dsound=auto
_nas=auto _nas=auto
_png=auto _png=auto
_mng=auto _mng=auto
@ -635,6 +637,8 @@ for ac_option do
--disable-vdpau) _vdpau=no ;; --disable-vdpau) _vdpau=no ;;
--enable-direct3d) _direct3d=yes ;; --enable-direct3d) _direct3d=yes ;;
--disable-direct3d) _direct3d=no ;; --disable-direct3d) _direct3d=no ;;
--enable-dsound) _dsound=yes ;;
--disable-dsound) _dsound=no ;;
--enable-png) _png=yes ;; --enable-png) _png=yes ;;
--disable-png) _png=no ;; --disable-png) _png=no ;;
--enable-mng) _mng=yes ;; --enable-mng) _mng=yes ;;
@ -2478,6 +2482,7 @@ echores "$_gl"
if win32; then if win32; then
echocheck "Direct3D" echocheck "Direct3D"
if test "$_direct3d" = auto ; then if test "$_direct3d" = auto ; then
_direct3d=no _direct3d=no
@ -2492,6 +2497,22 @@ else
fi fi
echores "$_direct3d" 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 fi #if win32; then
@ -3339,6 +3360,7 @@ COCOA = $_cocoa
COREAUDIO = $_coreaudio COREAUDIO = $_coreaudio
COREVIDEO = $_corevideo COREVIDEO = $_corevideo
DIRECT3D = $_direct3d DIRECT3D = $_direct3d
DSOUND = $_dsound
DVBIN = $_dvbin DVBIN = $_dvbin
DVDREAD = $_dvdread DVDREAD = $_dvdread
DXR3 = $_dxr3 DXR3 = $_dxr3
@ -3583,6 +3605,7 @@ $def_caca
$def_corevideo $def_corevideo
$def_cocoa $def_cocoa
$def_direct3d $def_direct3d
$def_dsound
$def_dvb $def_dvb
$def_dvbin $def_dvbin
$def_gif $def_gif

View File

@ -48,9 +48,6 @@ extern const struct ao_driver audio_out_portaudio;
static const struct ao_driver * const audio_out_drivers[] = { static const struct ao_driver * const audio_out_drivers[] = {
// native: // native:
#ifdef CONFIG_DIRECTX
&audio_out_dsound,
#endif
#ifdef CONFIG_COREAUDIO #ifdef CONFIG_COREAUDIO
&audio_out_coreaudio, &audio_out_coreaudio,
#endif #endif
@ -65,6 +62,9 @@ static const struct ao_driver * const audio_out_drivers[] = {
#endif #endif
#ifdef CONFIG_PORTAUDIO #ifdef CONFIG_PORTAUDIO
&audio_out_portaudio, &audio_out_portaudio,
#endif
#ifdef CONFIG_DSOUND
&audio_out_dsound,
#endif #endif
// wrappers: // wrappers:
#ifdef CONFIG_JACK #ifdef CONFIG_JACK
@ -72,13 +72,13 @@ static const struct ao_driver * const audio_out_drivers[] = {
#endif #endif
#ifdef CONFIG_OPENAL #ifdef CONFIG_OPENAL
&audio_out_openal, &audio_out_openal,
#endif
#ifdef CONFIG_ENCODING
&audio_out_lavc,
#endif #endif
&audio_out_null, &audio_out_null,
// should not be auto-selected: // should not be auto-selected:
&audio_out_pcm, &audio_out_pcm,
#ifdef CONFIG_ENCODING
&audio_out_lavc,
#endif
#ifdef CONFIG_RSOUND #ifdef CONFIG_RSOUND
&audio_out_rsound, &audio_out_rsound,
#endif #endif