From 02135001b44afc5446228228055c9ce7f29df5be Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 3 Aug 2008 15:21:40 +0000 Subject: Change a bunch of video/audio-output-specific preprocessor directives from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd.c | 2 +- libmpcodecs/vf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index eaacf06f59..9307bb4e81 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -86,7 +86,7 @@ vd_functions_t* mpcodecs_vd_drivers[] = { &mpcodecs_vd_libmpeg2, #endif &mpcodecs_vd_mpegpes, -#ifdef HAVE_ZR +#ifdef CONFIG_ZR &mpcodecs_vd_zrmjpeg, #endif #ifdef CONFIG_REALCODECS diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index d5ee319cc7..37ada3c59e 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -128,7 +128,7 @@ static const vf_info_t* const filter_list[]={ &vf_info_lavcdeint, &vf_info_screenshot, #endif -#ifdef HAVE_ZR +#ifdef CONFIG_ZR &vf_info_zrmjpeg, #endif &vf_info_dvbscale, -- cgit v1.2.3 From 0a749ffdc5ecaf1d34d53dfc8e12c6c3be121758 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 5 Aug 2008 08:47:51 +0000 Subject: Rename preprocessor directives related to image libraries. Change a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 9307bb4e81..281e67ba0c 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -74,10 +74,10 @@ vd_functions_t* mpcodecs_vd_drivers[] = { #ifdef CONFIG_XANIM &mpcodecs_vd_xanim, #endif -#ifdef HAVE_PNG +#ifdef CONFIG_PNG &mpcodecs_vd_mpng, #endif -#ifdef HAVE_JPEG +#ifdef CONFIG_JPEG &mpcodecs_vd_ijpg, #endif &mpcodecs_vd_mtga, -- cgit v1.2.3 From 473e2824cba09c93e9afb40a127ad5f07704c7ae Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 6 Aug 2008 07:42:26 +0000 Subject: Rename all preprocessor directives related to Apple / Mac OS X. Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_qtaudio.c | 10 +++++----- libmpcodecs/vd_qtvideo.c | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index bd6daf9edd..ffd2a381bd 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -5,7 +5,7 @@ #include "config.h" -#ifdef HAVE_QUICKTIME +#ifdef CONFIG_QUICKTIME #include #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 } diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index 4dd46caf84..2a7cf35ec7 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -4,7 +4,7 @@ #include "config.h" -#ifdef HAVE_QUICKTIME +#ifdef CONFIG_QUICKTIME #include #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 framedescHandle; 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 (*QTNewGWorldFromPtr)(GWorldPtr *gw, 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 } -- cgit v1.2.3 From e0b1c9a6b772683af9cb2a4f555cec1c5aa56afb Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 7 Aug 2008 12:20:50 +0000 Subject: Give a CONFIG_ prefix to preprocessor directives that lacked one and change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_libvorbis.c | 18 +++++++++--------- libmpcodecs/dec_audio.c | 6 +++--- libmpcodecs/dec_video.c | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad_libvorbis.c b/libmpcodecs/ad_libvorbis.c index f693d662cf..dd20c34984 100644 --- a/libmpcodecs/ad_libvorbis.c +++ b/libmpcodecs/ad_libvorbis.c @@ -20,7 +20,7 @@ static ad_info_t info = LIBAD_EXTERN(libvorbis) -#ifdef TREMOR +#ifdef CONFIG_TREMOR #include #else #include @@ -34,7 +34,7 @@ typedef struct ov_struct_st { vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ vorbis_block vb; /* local working space for packet->PCM decode */ float rg_scale; /* replaygain scale */ -#ifdef TREMOR +#ifdef CONFIG_TREMOR int rg_scale_int; #endif } ov_struct_t; @@ -160,7 +160,7 @@ static int init(sh_audio_t *sh) /* replaygain: security */ if(ov->rg_scale > 15.) ov->rg_scale = 15.; -#ifdef TREMOR +#ifdef CONFIG_TREMOR ov->rg_scale_int = (int)(ov->rg_scale*64.f); #endif mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Bitstream is %d channel%s, %dHz, %dbit/s %cBR\n",(int)ov->vi.channels,ov->vi.channels>1?"s":"",(int)ov->vi.rate,(int)ov->vi.bitrate_nominal, @@ -218,7 +218,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) { int len = 0; int samples; -#ifdef TREMOR +#ifdef CONFIG_TREMOR ogg_int32_t **pcm; #else float scale; @@ -250,7 +250,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) /* convert floats to 16 bit signed ints (host order) and interleave */ -#ifdef TREMOR +#ifdef CONFIG_TREMOR if (ov->rg_scale_int == 64) { for(i=0;ivi.channels;i++){ ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]); @@ -272,15 +272,15 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) } } } else -#endif /* TREMOR */ +#endif /* CONFIG_TREMOR */ { -#ifndef TREMOR +#ifndef CONFIG_TREMOR scale = 32767.f * ov->rg_scale; #endif for(i=0;ivi.channels;i++){ ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]); ogg_int16_t *ptr=convbuffer+i; -#ifdef TREMOR +#ifdef CONFIG_TREMOR ogg_int32_t *mono=pcm[i]; for(j=0;jrg_scale_int)>>(9+6); @@ -297,7 +297,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) val=-32768; clipflag=1; } -#endif /* TREMOR */ +#endif /* CONFIG_TREMOR */ *ptr=val; ptr+=ov->vi.channels; } diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index 28dc529318..23f19ac405 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -23,7 +23,7 @@ #include #endif -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS #include #endif @@ -167,7 +167,7 @@ static int init_audio(sh_audio_t *sh_audio, char *codecname, char *afm, sh_audio->codec->drv)) break; mpadec = mpcodecs_ad_drivers[i]; -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS if (!mpadec) { /* try to open shared decoder plugin */ int buf_len; @@ -297,7 +297,7 @@ void uninit_audio(sh_audio_t *sh_audio) mp_msg(MSGT_DECAUDIO, MSGL_V, MSGTR_UninitAudioStr, sh_audio->codec->drv); sh_audio->ad_driver->uninit(sh_audio); -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS if (sh_audio->dec_handle) dlclose(sh_audio->dec_handle); #endif diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index bfb2203dcd..0a76fc06bb 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -28,7 +28,7 @@ #include "dec_video.h" -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS #include #endif @@ -155,7 +155,7 @@ void uninit_video(sh_video_t *sh_video){ if(!sh_video->initialized) return; mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_UninitVideoStr,sh_video->codec->drv); mpvdec->uninit(sh_video); -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS if (sh_video->dec_handle) dlclose(sh_video->dec_handle); #endif @@ -205,7 +205,7 @@ static int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status, // if(mpcodecs_vd_drivers[i]->info->id==sh_video->codec->driver) break; if(!strcmp(mpcodecs_vd_drivers[i]->info->short_name,sh_video->codec->drv)) break; mpvdec=mpcodecs_vd_drivers[i]; -#ifdef DYNAMIC_PLUGINS +#ifdef CONFIG_DYNAMIC_PLUGINS if (!mpvdec) { /* try to open shared decoder plugin */ -- cgit v1.2.3