Mercurial > mplayer.hg

changeset 26208:4980ed598e8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduce a separate definition for Mac OS X coreaudio support.
author diego
date Sat, 15 Mar 2008 08:54:21 +0000
parents 55a36b9e708e
children 36ba5069e6f4
files configure libao2/audio_out.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sat Mar 15 08:21:02 2008 +0000
+++ b/configure	Sat Mar 15 08:54:21 2008 +0000
@@ -3575,14 +3575,18 @@
 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 @@
 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_macosx
 $_def_macosx_finder_support
 $_def_macosx_bundle
+$_def_coreaudio
 $_def_macosx_corevideo
 
 /* Build our Win32-loader */
--- a/libao2/audio_out.c	Sat Mar 15 08:21:02 2008 +0000
+++ b/libao2/audio_out.c	Sat Mar 15 08:54:21 2008 +0000
@@ -45,7 +45,7 @@
 #ifdef HAVE_WIN32WAVEOUT
         &audio_out_win32,
 #endif
-#ifdef MACOSX
+#ifdef HAVE_COREAUDIO
         &audio_out_macosx,
 #endif
 #ifdef USE_OSS_AUDIO