diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-15 08:54:21 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-15 08:54:21 +0000 |
| commit | f9da8542dd0caa5455b34bc2b09e250ad01b4a3c (patch) | |
| tree | 65d012d337ce041ca130f435a2faa1cf4e6cdd2a | |
| parent | 8c7467a0111147a6a65f37d9ba4eb9ac524a7fea (diff) | |
| download | mpv-f9da8542dd0caa5455b34bc2b09e250ad01b4a3c.tar.bz2 mpv-f9da8542dd0caa5455b34bc2b09e250ad01b4a3c.tar.xz | |
Introduce a separate definition for Mac OS X coreaudio support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26240 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libao2/audio_out.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -3575,14 +3575,18 @@ int main(void) { EOF if cc_check -framework Carbon -framework QuickTime -framework CoreAudio; then _ld_extra="$_ld_extra -framework Carbon -framework QuickTime -framework CoreAudio -framework AudioUnit -framework AudioToolbox" + _coreaudio=yes _def_macosx='#define MACOSX 1' + _def_coreaudio='#define HAVE_COREAUDIO 1' _aosrc="$_aosrc ao_macosx.c" _aomodules="macosx $_aomodules" _vosrc="$_vosrc vo_quartz.c" _vomodules="quartz $_vomodules" else _macosx=no + _coreaudio=yes _def_macosx='#undef MACOSX' + _def_coreaudio='#undef HAVE_COREAUDIO' _noaomodules="macosx $_noaomodules" _novomodules="quartz $_novomodules" fi @@ -7792,6 +7796,7 @@ XMMS_PLUGINS = $_xmms MACOSX = $_macosx MACOSX_FINDER_SUPPORT = $_macosx_finder_support MACOSX_BUNDLE = $_macosx_bundle +COREAUDIO = $_coreaudio MACOSX_COREVIDEO = $_macosx_corevideo TOOLAME=$_toolame TWOLAME=$_twolame @@ -8167,6 +8172,7 @@ $_def_win32dll $_def_macosx $_def_macosx_finder_support $_def_macosx_bundle +$_def_coreaudio $_def_macosx_corevideo /* Build our Win32-loader */ diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 9564fdd0da..c4f71cdf65 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -45,7 +45,7 @@ const ao_functions_t* const audio_out_drivers[] = #ifdef HAVE_WIN32WAVEOUT &audio_out_win32, #endif -#ifdef MACOSX +#ifdef HAVE_COREAUDIO &audio_out_macosx, #endif #ifdef USE_OSS_AUDIO |