[MPlayer-cvslog] r27420 - in trunk: configure input/input.c libao2/audio_out.c libmpcodecs/ad_qtaudio.c libmpcodecs/vd_qtvideo.c libmpdemux/demux_mov.c libvo/video_out.c
diego
subversion at mplayerhq.hu
Wed Aug 6 09:42:26 CEST 2008
Author: diego
Date: Wed Aug 6 09:42:26 2008
New Revision: 27420
Log:
Rename all preprocessor directives related to Apple / Mac OS X.
Switch them from a HAVE_ to a CONFIG_ prefix.
Modified:
trunk/configure
trunk/input/input.c
trunk/libao2/audio_out.c
trunk/libmpcodecs/ad_qtaudio.c
trunk/libmpcodecs/vd_qtvideo.c
trunk/libmpdemux/demux_mov.c
trunk/libvo/video_out.c
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Aug 6 09:42:26 2008
@@ -3577,21 +3577,21 @@ 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_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 @@ EOF
_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 @@ EOF
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 @@ EOF
cc_check && tmp_run && _apple_ir=yes
fi
if test "$_apple_ir" = yes ; then
- _def_apple_ir='#define HAVE_APPLE_IR 1'
+ _def_apple_ir='#define CONFIG_APPLE_IR 1'
else
- _def_apple_ir='#undef HAVE_APPLE_IR'
+ _def_apple_ir='#undef CONFIG_APPLE_IR'
fi
echores "$_apple_ir"
fi #if linux
Modified: trunk/input/input.c
==============================================================================
--- trunk/input/input.c (original)
+++ trunk/input/input.c Wed Aug 6 09:42:26 2008
@@ -436,7 +436,7 @@ static const mp_cmd_bind_t def_cmd_binds
{ { 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 int use_joystick = 1, use_lirc =
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 @@ mp_input_init(int use_gui) {
}
#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 @@ mp_input_init(int use_gui) {
}
#endif
-#ifdef HAVE_APPLE_IR
+#ifdef CONFIG_APPLE_IR
if(use_ar) {
int fd = mp_input_appleir_init(ar_dev);
if(fd < 0)
Modified: trunk/libao2/audio_out.c
==============================================================================
--- trunk/libao2/audio_out.c (original)
+++ trunk/libao2/audio_out.c Wed Aug 6 09:42:26 2008
@@ -45,7 +45,7 @@ const ao_functions_t* const audio_out_dr
#ifdef CONFIG_WIN32WAVEOUT
&audio_out_win32,
#endif
-#ifdef HAVE_COREAUDIO
+#ifdef CONFIG_COREAUDIO
&audio_out_macosx,
#endif
#ifdef CONFIG_OSS_AUDIO
Modified: trunk/libmpcodecs/ad_qtaudio.c
==============================================================================
--- trunk/libmpcodecs/ad_qtaudio.c (original)
+++ trunk/libmpcodecs/ad_qtaudio.c Wed Aug 6 09:42:26 2008
@@ -5,7 +5,7 @@
#include "config.h"
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
#include <QuickTime/QuickTimeComponents.h>
#endif
@@ -30,7 +30,7 @@ static ad_info_t info = {
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 @@ static int loader_init()
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 @@ static int preinit(sh_audio_t *sh){
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 @@ static void uninit(sh_audio_t *sh){
// FreeLibrary( qtime_qts );
// qtime_qts = NULL;
// printf("qt dll loader uninit done\n");
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
ExitMovies();
#endif
}
Modified: trunk/libmpcodecs/vd_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/vd_qtvideo.c (original)
+++ trunk/libmpcodecs/vd_qtvideo.c Wed Aug 6 09:42:26 2008
@@ -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 @@ LIBVD_EXTERN(qtvideo)
#include "mpbswap.h"
-#ifndef HAVE_QUICKTIME
+#ifndef CONFIG_QUICKTIME
#include "loader/qtx/qtxsdk/components.h"
HMODULE WINAPI LoadLibraryA(LPCSTR);
@@ -53,7 +53,7 @@ static ImageDescriptionHandle framedescH
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 @@ static OSErr (*QTNewGWorldF
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 @@ static int init(sh_video_t *sh){
ImageSubCodecDecompressCapabilities icap; // for ImageCodecInitialize()
codec_initialized = 0;
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
EnterMovies();
#else
@@ -154,7 +154,7 @@ static int init(sh_video_t *sh){
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 @@ static int init(sh_video_t *sh){
// uninit driver
static void uninit(sh_video_t *sh){
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
ExitMovies();
#endif
}
Modified: trunk/libmpdemux/demux_mov.c
==============================================================================
--- trunk/libmpdemux/demux_mov.c (original)
+++ trunk/libmpdemux/demux_mov.c Wed Aug 6 09:42:26 2008
@@ -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>
Modified: trunk/libvo/video_out.c
==============================================================================
--- trunk/libvo/video_out.c (original)
+++ trunk/libvo/video_out.c Wed Aug 6 09:42:26 2008
@@ -125,10 +125,10 @@ const vo_functions_t* const video_out_dr
#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
More information about the MPlayer-cvslog
mailing list