[MPlayer-cvslog] r26240 - in trunk: configure libao2/audio_out.c

[diego]

Author: diego
Date: Sat Mar 15 09:54:21 2008
New Revision: 26240

Log:
Introduce a separate definition for Mac OS X coreaudio support.


Modified:
   trunk/configure
   trunk/libao2/audio_out.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sat Mar 15 09:54:21 2008
@@ -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 */

Modified: trunk/libao2/audio_out.c
==============================================================================
--- trunk/libao2/audio_out.c	(original)
+++ trunk/libao2/audio_out.c	Sat Mar 15 09:54:21 2008
@@ -45,7 +45,7 @@ const ao_functions_t* const audio_out_dr
 #ifdef HAVE_WIN32WAVEOUT
         &audio_out_win32,
 #endif
-#ifdef MACOSX
+#ifdef HAVE_COREAUDIO
         &audio_out_macosx,
 #endif
 #ifdef USE_OSS_AUDIO