From a9f76c6d86d6fbbc91878995f0d3ff8d94690418 Mon Sep 17 00:00:00 2001 From: Jonathan Yong <10walls@gmail.com> Date: Thu, 13 Jun 2013 21:15:39 +0800 Subject: ao_wasapi0: add new wasapi event mode ao --- configure | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 349ae657b0..665ee17f3c 100755 --- a/configure +++ b/configure @@ -368,7 +368,8 @@ 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-dsound disable DirectSound audio output [autodetect] + --disable-wasapi0 disable WASAPI (event mode) audio output [autodetect] --disable-select disable using select() on the audio device [enable] Localization options: @@ -427,6 +428,7 @@ _direct3d=auto _sdl=no _sdl2=no _dsound=auto +_wasapi0=auto _mng=auto _jpeg=auto _gl=auto @@ -594,6 +596,8 @@ for ac_option do --disable-sdl2) _sdl2=no ;; --enable-dsound) _dsound=yes ;; --disable-dsound) _dsound=no ;; + --enable-waspi0) _waspi0=yes ;; + --disable-waspi0) _waspi0=no ;; --enable-mng) _mng=yes ;; --disable-mng) _mng=no ;; --enable-jpeg) _jpeg=yes ;; @@ -2193,6 +2197,46 @@ else fi echores "$_dsound" +echocheck "WASAPI" +if test "$_wasapi0" = auto ; then + _wasapi0=no + +cat > $TMPC << EOF +#define COBJMACROS 1 +#define _WIN32_WINNT 0x600 +#include +#include +#include +#include +#include +#include +#include +#include + const GUID *check1[] = { + &IID_IAudioClient, + &IID_IAudioRenderClient, + &IID_IAudioClient, + &IID_IAudioEndpointVolume, + }; +int main(void) { + return 0; +} +EOF + +if cc_check "-lole32 -lavrt"; then + _wasapi0="yes" +fi + +fi +if test "$_wasapi0" = yes ; then + def_wasapi0='#define CONFIG_WASAPI0 1' + aomodules="wasap0 $aomodules" + libs_mplayer="$libs_mplayer -lole32 -lavrt" +else + def_wasapi0='#undef CONFIG_WASAPI0' + noaomodules="wasaip0 $noaomodules" +fi +echores "$_wasapi0" fi #if win32; then @@ -3096,6 +3140,7 @@ DIRECT3D = $_direct3d SDL = $_sdl SDL2 = $_sdl2 DSOUND = $_dsound +WASAPI0 = $_wasapi0 DVBIN = $_dvbin DVDREAD = $_dvdread DXR3 = $_dxr3 @@ -3337,6 +3382,7 @@ $def_direct3d $def_sdl $def_sdl2 $def_dsound +$def_wasapi0 $def_dvb $def_dvbin $def_gl -- cgit v1.2.3