From 141e81cce4fb780a1e2f791c79c1664956401af7 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 7 Aug 2008 08:58:07 +0000 Subject: Rename a bunch of miscellaneous preprocessor directives. Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-common-opts.h | 2 +- cfg-mplayer.h | 2 +- configure | 48 ++++++++++++++++++++++++------------------------ gui/win32/gui.c | 8 ++++---- gui/win32/interface.c | 4 ++-- input/input.c | 12 ++++++------ libaf/af.c | 2 +- libmpdemux/demuxer.c | 2 +- mencoder.c | 2 +- mplayer.c | 2 +- stream/cdd.h | 4 ++-- stream/stream.c | 6 +++--- stream/stream_cdda.c | 16 ++++++++-------- 13 files changed, 55 insertions(+), 55 deletions(-) diff --git a/cfg-common-opts.h b/cfg-common-opts.h index 031084bcbc..5c33ac5e24 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -131,7 +131,7 @@ { "rawaudio", &demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, { "rawvideo", &demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, -#ifdef HAVE_CDDA +#ifdef CONFIG_CDDA { "cdda", &cdda_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif diff --git a/cfg-mplayer.h b/cfg-mplayer.h index b74c53a6bb..509ccd3aba 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -300,7 +300,7 @@ const m_option_t mplayer_opts[]={ {"dumpjacosub", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 8, NULL}, {"dumpsami", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 9, NULL}, -#ifdef HAVE_LIRC +#ifdef CONFIG_LIRC {"lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif diff --git a/configure b/configure index bfec4024f3..a2e08ba11d 100755 --- a/configure +++ b/configure @@ -5566,40 +5566,40 @@ EOF fi if test "$_libcdio" = yes && test "$_cdparanoia" = no ; then _cdda='yes' - _def_libcdio='#define HAVE_LIBCDIO' + _def_libcdio='#define CONFIG_LIBCDIO' _def_havelibcdio='yes' else if test "$_cdparanoia" = yes ; then _res_comment="using cdparanoia" fi - _def_libcdio='#undef HAVE_LIBCDIO' + _def_libcdio='#undef CONFIG_LIBCDIO' _def_havelibcdio='no' fi echores "$_libcdio" if test "$_cdda" = yes ; then test $_cddb = auto && test $_network = yes && _cddb=yes - _def_cdparanoia='#define HAVE_CDDA' + _def_cdparanoia='#define CONFIG_CDDA' _inputmodules="cdda $_inputmodules" else - _def_cdparanoia='#undef HAVE_CDDA' + _def_cdparanoia='#undef CONFIG_CDDA' _noinputmodules="cdda $_noinputmodules" fi if test "$_cddb" = yes ; then - _def_cddb='#define HAVE_CDDB' + _def_cddb='#define CONFIG_CDDB' _inputmodules="cddb $_inputmodules" else _cddb=no - _def_cddb='#undef HAVE_CDDB' + _def_cddb='#undef CONFIG_CDDB' _noinputmodules="cddb $_noinputmodules" fi echocheck "bitmap font support" if test "$_bitmap_font" = yes ; then - _def_bitmap_font="#define HAVE_BITMAP_FONT 1" + _def_bitmap_font="#define CONFIG_BITMAP_FONT 1" else - _def_bitmap_font="#undef HAVE_BITMAP_FONT" + _def_bitmap_font="#undef CONFIG_BITMAP_FONT" fi echores "$_bitmap_font" @@ -6223,9 +6223,9 @@ EOF cc_check && _ladspa=yes fi if test "$_ladspa" = yes; then - _def_ladspa="#define HAVE_LADSPA" + _def_ladspa="#define CONFIG_LADSPA" else - _def_ladspa="#undef HAVE_LADSPA" + _def_ladspa="#undef CONFIG_LADSPA" fi echores "$_ladspa" @@ -7224,11 +7224,11 @@ echores "$_select" echocheck "ftp" if ! beos && test "$_ftp" = yes ; then - _def_ftp='#define HAVE_FTP 1' + _def_ftp='#define CONFIG_FTP 1' _inputmodules="ftp $_inputmodules" else _noinputmodules="ftp $_noinputmodules" - _def_ftp='#undef HAVE_FTP' + _def_ftp='#undef CONFIG_FTP' fi echores "$_ftp" @@ -7243,12 +7243,12 @@ EOF cc_check -lvstream-client && _vstream=yes fi if test "$_vstream" = yes ; then - _def_vstream='#define HAVE_VSTREAM 1' + _def_vstream='#define CONFIG_VSTREAM 1' _inputmodules="vstream $_inputmodules" _ld_extra="$_ld_extra -lvstream-client" else _noinputmodules="vstream $_noinputmodules" - _def_vstream='#undef HAVE_VSTREAM' + _def_vstream='#undef CONFIG_VSTREAM' fi echores "$_vstream" @@ -7309,14 +7309,14 @@ if test "$_xmms" = yes ; then _xmmslibdir=/usr/lib fi - _def_xmms='#define HAVE_XMMS 1' + _def_xmms='#define CONFIG_XMMS 1' if darwin ; then _ld_extra="$_ld_extra ${_xmmslibdir}/libxmms.dylib" else _ld_extra="$_ld_extra ${_xmmslibdir}/libxmms.so.1 -export-dynamic" fi else - _def_xmms='#undef HAVE_XMMS' + _def_xmms='#undef CONFIG_XMMS' fi echores "$_xmms" @@ -7560,11 +7560,11 @@ test "$_debug" != "" && _def_debug='#define MP_DEBUG 1' echocheck "joystick" -_def_joystick='#undef HAVE_JOYSTICK' +_def_joystick='#undef CONFIG_JOYSTICK' if test "$_joystick" = yes ; then if linux ; then # TODO add some check - _def_joystick='#define HAVE_JOYSTICK 1' + _def_joystick='#define CONFIG_JOYSTICK 1' else _joystick="no" _res_comment="unsupported under $system_name" @@ -7582,10 +7582,10 @@ EOF cc_check -llirc_client && _lirc=yes fi if test "$_lirc" = yes ; then - _def_lirc='#define HAVE_LIRC 1' + _def_lirc='#define CONFIG_LIRC 1' _ld_extra="$_ld_extra -llirc_client" else - _def_lirc='#undef HAVE_LIRC' + _def_lirc='#undef CONFIG_LIRC' fi echores "$_lirc" @@ -7599,10 +7599,10 @@ EOF cc_check -llircc && _lircc=yes fi if test "$_lircc" = yes ; then - _def_lircc='#define HAVE_LIRCC 1' + _def_lircc='#define CONFIG_LIRCC 1' _ld_extra="$_ld_extra -llircc" else - _def_lircc='#undef HAVE_LIRCC' + _def_lircc='#undef CONFIG_LIRCC' fi echores "$_lircc" @@ -7619,11 +7619,11 @@ EOF cc_check `$_pkg_config --cflags --libs libosso 2>/dev/null` && _maemo=yes fi if test "$_maemo" = yes ; then - _def_maemo='#define HAVE_MAEMO 1' + _def_maemo='#define CONFIG_MAEMO 1' _inc_extra="$_inc_extra `$_pkg_config --cflags libosso`" _ld_extra="$_ld_extra `$_pkg_config --libs libosso` -lXsp" else - _def_maemo='#undef HAVE_MAEMO' + _def_maemo='#undef CONFIG_MAEMO' fi echores "$_maemo" fi diff --git a/gui/win32/gui.c b/gui/win32/gui.c index a56a4c77a7..35268938a6 100644 --- a/gui/win32/gui.c +++ b/gui/win32/gui.c @@ -804,7 +804,7 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM char device[MAX_PATH]; char searchpath[MAX_PATH]; char searchpath2[MAX_PATH]; -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO char searchpath3[MAX_PATH]; #endif int len, pos = 0, cdromdrive = 0; @@ -826,14 +826,14 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] checking %s for CD/VCD/SVCD/DVDs\n", device + pos); sprintf(searchpath, "%sVIDEO_TS", device + pos); sprintf(searchpath2, "%sMpegav", device + pos); -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO sprintf(searchpath3, "%sTrack01.cda", device + pos); #endif if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES) flags |= MF_ENABLED; else if(GetFileAttributes(searchpath2) != INVALID_FILE_ATTRIBUTES) flags |= MF_ENABLED; -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO else if(GetFileAttributes(searchpath3) != INVALID_FILE_ATTRIBUTES) flags |= MF_ENABLED; #endif @@ -1015,7 +1015,7 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM sprintf(searchpath, "%sTrack01.cda", device + pos); if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES) { -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO if (cdrom_device) free(cdrom_device); cdrom_device = strdup(device + pos); /* mplayer doesn't seem to like the trailing \ after the device name */ diff --git a/gui/win32/interface.c b/gui/win32/interface.c index 6b3eaafc54..209a1889d4 100644 --- a/gui/win32/interface.c +++ b/gui/win32/interface.c @@ -41,7 +41,7 @@ #include "access_mpcontext.h" #include "gui.h" #include "dialogs.h" -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO #include #endif @@ -173,7 +173,7 @@ static void guiSetEvent(int event) break; } #endif -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO case evPlayCD: { int i; diff --git a/input/input.c b/input/input.c index bca690f392..0a9b571f0e 100644 --- a/input/input.c +++ b/input/input.c @@ -29,11 +29,11 @@ #include "joystick.h" -#ifdef HAVE_LIRC +#ifdef CONFIG_LIRC #include "lirc.h" #endif -#ifdef HAVE_LIRCC +#ifdef CONFIG_LIRCC #include #endif @@ -426,7 +426,7 @@ static const mp_cmd_bind_t def_cmd_binds[] = { { { 'W', 0 }, "step_property teletext_page 1" }, { { 'Q', 0 }, "step_property teletext_page -1" }, #endif -#ifdef HAVE_JOYSTICK +#ifdef CONFIG_JOYSTICK { { JOY_AXIS0_PLUS, 0 }, "seek 10" }, { { JOY_AXIS0_MINUS, 0 }, "seek -10" }, { { JOY_AXIS1_MINUS, 0 }, "seek 60" }, @@ -1733,7 +1733,7 @@ mp_input_init(int use_gui) { free(file); } -#ifdef HAVE_JOYSTICK +#ifdef CONFIG_JOYSTICK if(use_joystick) { int fd = mp_input_joystick_init(js_dev); if(fd < 0) @@ -1743,7 +1743,7 @@ mp_input_init(int use_gui) { } #endif -#ifdef HAVE_LIRC +#ifdef CONFIG_LIRC if(use_lirc) { int fd = mp_input_lirc_init(); if(fd > 0) @@ -1751,7 +1751,7 @@ mp_input_init(int use_gui) { } #endif -#ifdef HAVE_LIRCC +#ifdef CONFIG_LIRCC if(use_lircc) { int fd = lircc_init("mplayer", NULL); if(fd >= 0) diff --git a/libaf/af.c b/libaf/af.c index de84807875..06e2a065d2 100644 --- a/libaf/af.c +++ b/libaf/af.c @@ -60,7 +60,7 @@ static af_info_t* filter_list[]={ #endif &af_info_sweep, &af_info_hrtf, -#ifdef HAVE_LADSPA +#ifdef CONFIG_LADSPA &af_info_ladspa, #endif &af_info_center, diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index b9220ccc3e..862a0e4310 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -149,7 +149,7 @@ const demuxer_desc_t *const demuxer_list[] = { #ifdef CONFIG_LIBNUT &demuxer_desc_nut, #endif -#ifdef HAVE_XMMS +#ifdef CONFIG_XMMS &demuxer_desc_xmms, #endif /* Please do not add any new demuxers here. If you want to implement a new diff --git a/mencoder.c b/mencoder.c index 904a95d2c1..3b86c446ef 100644 --- a/mencoder.c +++ b/mencoder.c @@ -537,7 +537,7 @@ if (frameno_filename) { if(font_fontconfig <= 0) { #endif -#ifdef HAVE_BITMAP_FONT +#ifdef CONFIG_BITMAP_FONT if(font_name){ vo_font=read_font_desc(font_name,font_factor,verbose>1); if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name); diff --git a/mplayer.c b/mplayer.c index 2abe64444b..8fcd38ea2f 100644 --- a/mplayer.c +++ b/mplayer.c @@ -2789,7 +2789,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ if(font_fontconfig <= 0) { #endif -#ifdef HAVE_BITMAP_FONT +#ifdef CONFIG_BITMAP_FONT if(font_name){ vo_font=read_font_desc(font_name,font_factor,verbose>1); if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont, diff --git a/stream/cdd.h b/stream/cdd.h index 10fb64763f..1208684769 100644 --- a/stream/cdd.h +++ b/stream/cdd.h @@ -2,7 +2,7 @@ #define MPLAYER_CDD_H #include "config.h" -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO #include #include #else @@ -54,7 +54,7 @@ typedef struct { } cd_info_t; typedef struct { -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO cdrom_drive* cd; cdrom_paranoia* cdp; #else diff --git a/stream/stream.c b/stream/stream.c index d9636da1f6..da2f8731d8 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -68,7 +68,7 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef CONFIG_VCD &stream_info_vcd, #endif -#ifdef HAVE_CDDA +#ifdef CONFIG_CDDA &stream_info_cdda, #endif #ifdef MPLAYER_NETWORK @@ -97,10 +97,10 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef CONFIG_PVR &stream_info_pvr, #endif -#ifdef HAVE_FTP +#ifdef CONFIG_FTP &stream_info_ftp, #endif -#ifdef HAVE_VSTREAM +#ifdef CONFIG_VSTREAM &stream_info_vstream, #endif #ifdef LIBSMBCLIENT diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 00c8a4934e..fb6f2e9358 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -147,7 +147,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { struct cdda_params* p = (struct cdda_params*)opts; int mode = p->paranoia_mode; int offset = p->toc_offset; -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO cdrom_drive* cdd = NULL; #else cdrom_drive_t* cdd = NULL; @@ -171,7 +171,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { p->device = strdup(DEFAULT_CDROM_DEVICE); } -#ifdef HAVE_CDDB +#ifdef CONFIG_CDDB // cdd_identify returns -1 if it cannot read the TOC, // in which case there is no point in calling cddb_resolve if(cdd_identify(p->device) >= 0 && strncmp(st->url,"cddb",4) == 0) { @@ -183,7 +183,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { } #endif -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO if(p->generic_dev) cdd = cdda_identify_scsi(p->generic_dev,p->device,0,NULL); else @@ -205,7 +205,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { if(p->sector_size) { cdd->nsectors = p->sector_size; -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO cdd->bigbuff = p->sector_size * CD_FRAMESIZE_RAW; #endif } @@ -283,7 +283,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { if(p->no_skip) mode |= PARANOIA_MODE_NEVERSKIP; -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO paranoia_modeset(cdd, mode); if(p->search_overlap >= 0) @@ -298,7 +298,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { paranoia_seek(priv->cdp,priv->start_sector,SEEK_SET); priv->sector = priv->start_sector; -#ifdef HAVE_CDDB +#ifdef CONFIG_CDDB if(cddb_info) { cd_info_free(cd_info); priv->cd_info = cddb_info; @@ -324,7 +324,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { return STREAM_OK; } -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO static void cdparanoia_callback(long inpos, int function) { #else static void cdparanoia_callback(long int inpos, paranoia_cb_mode_t function) { @@ -438,7 +438,7 @@ const stream_info_t stream_info_cdda = { "", open_cdda, { "cdda", -#ifdef HAVE_CDDB +#ifdef CONFIG_CDDB "cddb", #endif NULL }, -- cgit v1.2.3