changeset 27388:ac03760f7fcc

Rename all preprocessor directives related to Apple / Mac OS X. Switch them from a HAVE_ to a CONFIG_ prefix.

--- a/configure	Tue Aug 05 16:32:47 2008 +0000
+++ b/configure	Wed Aug 06 07:42:26 2008 +0000
@@ -3577,21 +3577,21 @@
   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_coreaudio='#define HAVE_COREAUDIO 1'
+    _def_coreaudio='#define CONFIG_COREAUDIO 1'
     _aosrc="$_aosrc ao_macosx.c"
     _aomodules="macosx $_aomodules"
-    _def_quartz='#define HAVE_QUARTZ 1'
+    _def_quartz='#define CONFIG_QUARTZ 1'
     _vosrc="$_vosrc vo_quartz.c"
     _vomodules="quartz $_vomodules"
-    _def_quicktime='#define HAVE_QUICKTIME 1'
+    _def_quicktime='#define CONFIG_QUICKTIME 1'
   else
     _macosx=no
     _coreaudio=no
-    _def_coreaudio='#undef HAVE_COREAUDIO'
+    _def_coreaudio='#undef CONFIG_COREAUDIO'
     _noaomodules="macosx $_noaomodules"
-    _def_quartz='#undef HAVE_QUARTZ'
+    _def_quartz='#undef CONFIG_QUARTZ'
     _novomodules="quartz $_novomodules"
-    _def_quicktime='#undef HAVE_QUICKTIME'
+    _def_quicktime='#undef CONFIG_QUICKTIME'
   fi
 cat > $TMPC <<EOF
 #include <Carbon/Carbon.h>
@@ -3602,11 +3602,11 @@
 		_vosrc="$_vosrc vo_macosx.m"
 		_vomodules="macosx $_vomodules"
 		_ld_extra="$_ld_extra -framework Cocoa -framework QuartzCore -framework OpenGL"
-		_def_corevideo='#define HAVE_COREVIDEO 1'
+		_def_corevideo='#define CONFIG_COREVIDEO 1'
 		_corevideo=yes
 	else
 		_novomodules="macosx $_novomodules"
-		_def_corevideo='#undef HAVE_COREVIDEO'
+		_def_corevideo='#undef CONFIG_COREVIDEO'
 		_corevideo=no
 	fi
 fi
@@ -3667,10 +3667,10 @@
   cc_check -framework IOKit && tmp_run && _apple_remote=yes
 fi
 if test "$_apple_remote" = yes ; then
-  _def_apple_remote='#define HAVE_APPLE_REMOTE 1'
+  _def_apple_remote='#define CONFIG_APPLE_REMOTE 1'
   _ld_extra="$_ld_extra -framework IOKit"
 else
-  _def_apple_remote='#undef HAVE_APPLE_REMOTE'
+  _def_apple_remote='#undef CONFIG_APPLE_REMOTE'
 fi
 echores "$_apple_remote"
 
@@ -3693,9 +3693,9 @@
   cc_check && tmp_run && _apple_ir=yes
 fi
 if test "$_apple_ir" = yes ; then
-  _def_apple_ir='#define HAVE_APPLE_IR 1'
-else
-  _def_apple_ir='#undef HAVE_APPLE_IR'
+  _def_apple_ir='#define CONFIG_APPLE_IR 1'
+else
+  _def_apple_ir='#undef CONFIG_APPLE_IR'
 fi
 echores "$_apple_ir"
 fi #if linux

--- a/input/input.c	Tue Aug 05 16:32:47 2008 +0000
+++ b/input/input.c	Wed Aug 06 07:42:26 2008 +0000
@@ -436,7 +436,7 @@
   { { JOY_BTN2, 0 }, "volume 1"},
   { { JOY_BTN3, 0 }, "volume -1"},
 #endif
-#ifdef HAVE_APPLE_REMOTE
+#ifdef CONFIG_APPLE_REMOTE
   { { AR_PLAY, 0}, "pause" },
   { { AR_PLAY_HOLD, 0}, "quit" },
   { { AR_NEXT, 0 }, "seek 30" },
@@ -568,7 +568,7 @@
 static char* config_file = "input.conf";
 
 /* Apple Remote */
-#ifdef HAVE_APPLE_REMOTE
+#ifdef CONFIG_APPLE_REMOTE
 static int use_ar = 1;
 #else
 static int use_ar = 0;
@@ -1759,7 +1759,7 @@
   }
 #endif
 
-#ifdef HAVE_APPLE_REMOTE
+#ifdef CONFIG_APPLE_REMOTE
   if(use_ar) {
     if(mp_input_ar_init() < 0)
       mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantInitAppleRemote);
@@ -1768,7 +1768,7 @@
   }
 #endif
 
-#ifdef HAVE_APPLE_IR
+#ifdef CONFIG_APPLE_IR
   if(use_ar) {
     int fd = mp_input_appleir_init(ar_dev);
     if(fd < 0)

--- a/libao2/audio_out.c	Tue Aug 05 16:32:47 2008 +0000
+++ b/libao2/audio_out.c	Wed Aug 06 07:42:26 2008 +0000
@@ -45,7 +45,7 @@
 #ifdef CONFIG_WIN32WAVEOUT
         &audio_out_win32,
 #endif
-#ifdef HAVE_COREAUDIO
+#ifdef CONFIG_COREAUDIO
         &audio_out_macosx,
 #endif
 #ifdef CONFIG_OSS_AUDIO

--- a/libmpcodecs/ad_qtaudio.c	Tue Aug 05 16:32:47 2008 +0000
+++ b/libmpcodecs/ad_qtaudio.c	Wed Aug 06 07:42:26 2008 +0000
@@ -5,7 +5,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
 #include <QuickTime/QuickTimeComponents.h>
 #endif
 
@@ -30,7 +30,7 @@
 
 LIBAD_EXTERN(qtaudio)
 
-#ifndef HAVE_QUICKTIME
+#ifndef CONFIG_QUICKTIME
 typedef struct OpaqueSoundConverter*    SoundConverter;
 typedef unsigned long                   OSType;
 typedef unsigned long                   UnsignedFixed;
@@ -164,7 +164,7 @@
     mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n");
 	return 0;
 }
-#endif /* #ifndef HAVE_QUICKTIME */
+#endif /* #ifndef CONFIG_QUICKTIME */
 
 static SoundConverter			   myConverter = NULL;
 static SoundComponentData		   InputFormatInfo,OutputFormatInfo;
@@ -180,7 +180,7 @@
     unsigned long WantedBufferSize=0; //the size you want your buffers to be
 
 
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
     EnterMovies();
 #else
     if(loader_init()) return 0; // failed to load DLL
@@ -280,7 +280,7 @@
 //    FreeLibrary( qtime_qts );
 //    qtime_qts = NULL;
 //    printf("qt dll loader uninit done\n");
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
     ExitMovies();
 #endif
 }

--- a/libmpcodecs/vd_qtvideo.c	Tue Aug 05 16:32:47 2008 +0000
+++ b/libmpcodecs/vd_qtvideo.c	Wed Aug 06 07:42:26 2008 +0000
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
 #include <QuickTime/ImageCodec.h>
 #define dump_ImageDescription(x)
 #endif
@@ -30,7 +30,7 @@
 
 #include "mpbswap.h"
 
-#ifndef HAVE_QUICKTIME
+#ifndef CONFIG_QUICKTIME
 #include "loader/qtx/qtxsdk/components.h"
 
 HMODULE   WINAPI LoadLibraryA(LPCSTR);
@@ -53,7 +53,7 @@
 static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts
 static HMODULE handler;
 
-#ifndef HAVE_QUICKTIME
+#ifndef CONFIG_QUICKTIME
 static    Component (*FindNextComponent)(Component prev,ComponentDescription* desc);
 static    OSErr (*GetComponentInfo)(Component prev,ComponentDescription* desc,Handle h1,Handle h2,Handle h3);
 static    long (*CountComponents)(ComponentDescription* desc);
@@ -88,7 +88,7 @@
                                void *baseAddr,
                                long rowBytes); 
 static    OSErr           (*NewHandleClear)(Size byteCount);                          
-#endif /* #ifndef HAVE_QUICKTIME */
+#endif /* #ifndef CONFIG_QUICKTIME */
 
 // to set/get/query special features/parameters
 static int control(sh_video_t *sh,int cmd,void* arg,...){
@@ -107,7 +107,7 @@
     ImageSubCodecDecompressCapabilities icap; // for ImageCodecInitialize()
 
     codec_initialized = 0;
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
     EnterMovies();
 #else
 
@@ -154,7 +154,7 @@
     mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"InitializeQTML returned %li\n",result);
 //    result=EnterMovies();
 //    printf("EnterMovies->%d\n",result);
-#endif /* HAVE_QUICKTIME */
+#endif /* CONFIG_QUICKTIME */
 
 #if 0
     memset(&desc,0,sizeof(desc));
@@ -293,7 +293,7 @@
 
 // uninit driver
 static void uninit(sh_video_t *sh){
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
     ExitMovies();
 #endif
 }

--- a/libmpdemux/demux_mov.c	Tue Aug 05 16:32:47 2008 +0000
+++ b/libmpdemux/demux_mov.c	Wed Aug 06 07:42:26 2008 +0000
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
 #include <QuickTime/QuickTime.h>
 #include <QuickTime/ImageCompression.h>
 #include <QuickTime/ImageCodec.h>

--- a/libvo/video_out.c	Tue Aug 05 16:32:47 2008 +0000
+++ b/libvo/video_out.c	Wed Aug 06 07:42:26 2008 +0000
@@ -125,10 +125,10 @@
 #ifdef CONFIG_DIRECTX
         &video_out_directx,
 #endif
-#ifdef HAVE_COREVIDEO
+#ifdef CONFIG_COREVIDEO
 	&video_out_macosx,
 #endif
-#ifdef HAVE_QUARTZ
+#ifdef CONFIG_QUARTZ
 	&video_out_quartz,
 #endif
 #ifdef CONFIG_XMGA