diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-03 15:21:40 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-03 15:21:40 +0000 |
| commit | 02135001b44afc5446228228055c9ce7f29df5be (patch) | |
| tree | 9a4243fe1da1f111cafab0a39c1b25720afab34b | |
| parent | 52d358e3dcd4bc813441f6e23d8d9d212a18d7dd (diff) | |
| download | mpv-02135001b44afc5446228228055c9ce7f29df5be.tar.bz2 mpv-02135001b44afc5446228228055c9ce7f29df5be.tar.xz | |
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
61 files changed, 240 insertions, 239 deletions
@@ -741,7 +741,7 @@ checkheaders: $(ALLHEADERS:.h=.ho) dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part depend; done -$(FFMPEGLIBS): $(FFMPEGFILES) libvo/fastmemcpy.h config.h +$(FFMPEGLIBS): $(FFMPEGFILES) libvo/fastmemcpy.h #config.h $(MAKE) -C $(@D) touch $@ diff --git a/cfg-common-opts.h b/cfg-common-opts.h index 77b96ae5c9..031084bcbc 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -156,13 +156,13 @@ #else {"tv", "MPlayer was compiled without TV interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif /* CONFIG_TV */ -#ifdef HAVE_PVR +#ifdef CONFIG_PVR {"pvr", pvropts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #else {"pvr", "MPlayer was compiled without V4L2/PVR interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -#endif /* HAVE_PVR */ +#endif /* CONFIG_PVR */ {"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN {"dvbin", dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif diff --git a/cfg-common.h b/cfg-common.h index 14d3dd4339..7481ae71f1 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -90,7 +90,7 @@ const m_option_t tvopts_conf[]={ {"chanlist", &stream_tv_defaults.chanlist, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"norm", &stream_tv_defaults.norm, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"automute", &stream_tv_defaults.automute, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, -#if defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW) +#if defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW) {"normid", &stream_tv_defaults.normid, CONF_TYPE_INT, 0, 0, 0, NULL}, #endif {"width", &stream_tv_defaults.width, CONF_TYPE_INT, 0, 0, 4096, NULL}, @@ -104,12 +104,12 @@ const m_option_t tvopts_conf[]={ {"hue", &stream_tv_defaults.hue, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL}, {"saturation", &stream_tv_defaults.saturation, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL}, {"gain", &stream_tv_defaults.gain, CONF_TYPE_INT, CONF_RANGE, -1, 100, NULL}, -#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW) +#if defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW) {"buffersize", &stream_tv_defaults.buffer_size, CONF_TYPE_INT, CONF_RANGE, 16, 1024, NULL}, {"amode", &stream_tv_defaults.amode, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, {"volume", &stream_tv_defaults.volume, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL}, #endif -#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2) +#if defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2) {"bass", &stream_tv_defaults.bass, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL}, {"treble", &stream_tv_defaults.treble, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL}, {"balance", &stream_tv_defaults.balance, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL}, @@ -122,16 +122,16 @@ const m_option_t tvopts_conf[]={ #if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) {"alsa", &stream_tv_defaults.alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #endif /* defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) */ -#endif /* defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2) */ +#endif /* defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2) */ {"adevice", &stream_tv_defaults.adevice, CONF_TYPE_STRING, 0, 0, 0, NULL}, -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT {"tdevice", &stream_tv_defaults.tdevice, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"tpage", &stream_tv_defaults.tpage, CONF_TYPE_INT, CONF_RANGE, 100, 899, NULL}, {"tformat", &stream_tv_defaults.tformat, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, {"tlang", &stream_tv_defaults.tlang, CONF_TYPE_INT, CONF_RANGE, -1, 0x7f, NULL}, -#endif /* HAVE_TV_TELETEXT */ +#endif /* CONFIG_TV_TELETEXT */ {"audioid", &stream_tv_defaults.audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, -#ifdef HAVE_TV_DSHOW +#ifdef CONFIG_TV_DSHOW {"hidden_video_renderer", &stream_tv_defaults.hidden_video_renderer, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nohidden_video_renderer", &stream_tv_defaults.hidden_video_renderer, CONF_TYPE_FLAG, 0, 0, 0, NULL}, {"hidden_vp_renderer", &stream_tv_defaults.hidden_vp_renderer, CONF_TYPE_FLAG, 0, 0, 1, NULL}, @@ -145,7 +145,7 @@ const m_option_t tvopts_conf[]={ }; #endif /* CONFIG_TV */ -#ifdef HAVE_PVR +#ifdef CONFIG_PVR extern int pvr_param_aspect_ratio; extern int pvr_param_sample_rate; extern int pvr_param_audio_layer; @@ -168,9 +168,9 @@ const m_option_t pvropts_conf[]={ {"fmt", &pvr_param_stream_type, CONF_TYPE_STRING, 0, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; -#endif /* HAVE_PVR */ +#endif /* CONFIG_PVR */ -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN #include "stream/dvbin.h" extern const m_config_t dvbin_opts_conf[]; #endif diff --git a/cfg-mplayer.h b/cfg-mplayer.h index ed29c70372..052e80885c 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -231,12 +231,12 @@ const m_option_t mplayer_opts[]={ {"aa*", "-aa* has been removed. Use -vo aa:suboption instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif -#ifdef HAVE_ZR +#ifdef CONFIG_ZR // -vo zr {"zr*", vo_zr_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0, &vo_zr_revertoption }, #endif -#ifdef HAVE_DXR2 +#ifdef CONFIG_DXR2 {"dxr2", &dxr2_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif @@ -34,10 +34,10 @@ #ifdef CONFIG_RADIO #include "stream/stream_radio.h" #endif -#ifdef HAVE_PVR +#ifdef CONFIG_PVR #include "stream/pvr.h" #endif -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN #include "stream/dvbin.h" #endif #ifdef CONFIG_DVDREAD @@ -1860,7 +1860,7 @@ static int mp_property_tv_color(m_option_t * prop, int action, void *arg, #endif -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT static int mp_property_teletext_common(m_option_t * prop, int action, void *arg, MPContext * mpctx) { @@ -1941,7 +1941,7 @@ static int mp_property_teletext_page(m_option_t * prop, int action, void *arg, } -#endif /* HAVE_TV_TELETEXT */ +#endif /* CONFIG_TV_TELETEXT */ ///@} @@ -2092,7 +2092,7 @@ static const m_option_t mp_properties[] = { M_OPT_RANGE, -100, 100, (void *) TV_COLOR_HUE }, #endif -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT { "teletext_page", mp_property_teletext_page, CONF_TYPE_INT, M_OPT_RANGE, 100, 899, (void*)TV_VBI_CONTROL_GET_PAGE }, { "teletext_subpage", mp_property_teletext_common, CONF_TYPE_INT, @@ -2704,28 +2704,28 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd) if (mpctx->file_format == DEMUXER_TYPE_TV) tv_set_freq((tvi_handle_t *) (mpctx->demuxer->priv), cmd->args[0].v.f * 16.0); -#ifdef HAVE_PVR +#ifdef CONFIG_PVR else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) { pvr_set_freq (mpctx->stream, ROUND (cmd->args[0].v.f)); set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s", pvr_get_current_channelname (mpctx->stream), pvr_get_current_stationname (mpctx->stream)); } -#endif /* HAVE_PVR */ +#endif /* CONFIG_PVR */ break; case MP_CMD_TV_STEP_FREQ: if (mpctx->file_format == DEMUXER_TYPE_TV) tv_step_freq((tvi_handle_t *) (mpctx->demuxer->priv), cmd->args[0].v.f * 16.0); -#ifdef HAVE_PVR +#ifdef CONFIG_PVR else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) { pvr_force_freq_step (mpctx->stream, ROUND (cmd->args[0].v.f)); set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: f %d", pvr_get_current_channelname (mpctx->stream), pvr_get_current_frequency (mpctx->stream)); } -#endif /* HAVE_PVR */ +#endif /* CONFIG_PVR */ break; case MP_CMD_TV_SET_NORM: @@ -2752,7 +2752,7 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd) //vo_osd_changed(OSDTYPE_SUBTITLE); } } -#ifdef HAVE_PVR +#ifdef CONFIG_PVR else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) { pvr_set_channel_step (mpctx->stream, cmd->args[0].v.i); @@ -2760,9 +2760,9 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd) pvr_get_current_channelname (mpctx->stream), pvr_get_current_stationname (mpctx->stream)); } -#endif /* HAVE_PVR */ +#endif /* CONFIG_PVR */ } -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN if (mpctx->stream->type == STREAMTYPE_DVB) { int dir; int v = cmd->args[0].v.i; @@ -2777,7 +2777,7 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd) if (dvb_step_channel(mpctx->stream, dir)) mpctx->eof = mpctx->dvbin_reopen = 1; } -#endif /* HAS_DVBIN_SUPPORT */ +#endif /* CONFIG_DVBIN */ break; case MP_CMD_TV_SET_CHANNEL: @@ -2790,17 +2790,17 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd) //vo_osd_changed(OSDTYPE_SUBTITLE); } } -#ifdef HAVE_PVR +#ifdef CONFIG_PVR else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) { pvr_set_channel (mpctx->stream, cmd->args[0].v.s); set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s", pvr_get_current_channelname (mpctx->stream), pvr_get_current_stationname (mpctx->stream)); } -#endif /* HAVE_PVR */ +#endif /* CONFIG_PVR */ break; -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN case MP_CMD_DVB_SET_CHANNEL: if (mpctx->stream->type == STREAMTYPE_DVB) { mpctx->last_dvb_step = 1; @@ -2810,7 +2810,7 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd) mpctx->eof = mpctx->dvbin_reopen = 1; } break; -#endif /* HAS_DVBIN_SUPPORT */ +#endif /* CONFIG_DVBIN */ case MP_CMD_TV_LAST_CHANNEL: if (mpctx->file_format == DEMUXER_TYPE_TV) { @@ -2821,14 +2821,14 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd) //vo_osd_changed(OSDTYPE_SUBTITLE); } } -#ifdef HAVE_PVR +#ifdef CONFIG_PVR else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) { pvr_set_lastchannel (mpctx->stream); set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s", pvr_get_current_channelname (mpctx->stream), pvr_get_current_stationname (mpctx->stream)); } -#endif /* HAVE_PVR */ +#endif /* CONFIG_PVR */ break; case MP_CMD_TV_STEP_NORM: @@ -2840,7 +2840,7 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd) if (mpctx->file_format == DEMUXER_TYPE_TV) tv_step_chanlist((tvi_handle_t *) (mpctx->demuxer->priv)); break; -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT case MP_CMD_TV_TELETEXT_ADD_DEC: { tvi_handle_t* tvh=(tvi_handle_t *)(mpctx->demuxer->priv); @@ -2855,7 +2855,7 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd) tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GO_LINK,&(cmd->args[0].v.i)); break; } -#endif /* HAVE_TV_TELETEXT */ +#endif /* CONFIG_TV_TELETEXT */ #endif /* CONFIG_TV */ case MP_CMD_SUB_LOAD: @@ -4537,8 +4537,8 @@ EOF fi echores "$_dvb" if test "$_dvb" = yes ; then - _def_dvb='#define HAVE_DVB 1' - _def_dvb_in='#define HAS_DVBIN_SUPPORT 1' + _def_dvb='#define CONFIG_DVB 1' + _def_dvbin='#define CONFIG_DVBIN 1' _aomodules="mpegpes(dvb) $_aomodules" _vomodules="mpegpes(dvb) $_vomodules" fi @@ -4566,17 +4566,18 @@ EOF fi echores "$_dvbhead" if test "$_dvbhead" = yes ; then - _def_dvb='#define HAVE_DVB 1' - _def_dvb_head='#define HAVE_DVB_HEAD 1' - _def_dvb_in='#define HAS_DVBIN_SUPPORT 1' + _def_dvb='#define CONFIG_DVB 1' + _def_dvb_head='#define CONFIG_DVB_HEAD 1' + _def_dvbin='#define CONFIG_DVBIN 1' _aomodules="mpegpes(dvb) $_aomodules" _vomodules="mpegpes(dvb) $_vomodules" fi if test "$_dvbhead" = no && test "$_dvb" = no ; then - _def_dvb='#undef HAVE_DVB' + _def_dvb='#undef CONFIG_DVB' + _def_dvb_head='#undef CONFIG_DVB_HEAD' _def_dvb_head='#undef HAVE_DVB_HEAD' - _def_dvb_in='#undef HAS_DVBIN_SUPPORT ' + _def_dvbin='#undef CONFIG_DVBIN ' _aomodules="mpegpes(file) $_aomodules" _vomodules="mpegpes(file) $_vomodules" fi @@ -4821,7 +4822,7 @@ EOF fi fi if test "$_sdl" = yes ; then - _def_sdl='#define HAVE_SDL 1' + _def_sdl='#define CONFIG_SDL 1' if cygwin ; then _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/`" _inc_extra="$_inc_extra `$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/`" @@ -4838,7 +4839,7 @@ if test "$_sdl" = yes ; then _aomodules="sdl $_aomodules" _res_comment="using $_sdlconfig" else - _def_sdl='#undef HAVE_SDL' + _def_sdl='#undef CONFIG_SDL' _novomodules="sdl $_novomodules" _noaomodules="sdl $_noaomodules" fi @@ -4929,13 +4930,13 @@ EOF done fi if test "$_dxr2" = yes; then - _def_dxr2='#define HAVE_DXR2 1' + _def_dxr2='#define CONFIG_DXR2 1' _vosrc="$_vosrc vo_dxr2.c" _aosrc="$_aosrc ao_dxr2.c" _aomodules="dxr2 $_aomodules" _vomodules="dxr2 $_vomodules" else - _def_dxr2='#undef HAVE_DXR2' + _def_dxr2='#undef CONFIG_DXR2' _noaomodules="dxr2 $_noaomodules" _novomodules="dxr2 $_novomodules" fi @@ -4951,11 +4952,11 @@ EOF cc_check && _dxr3=yes fi if test "$_dxr3" = yes ; then - _def_dxr3='#define HAVE_DXR3 1' + _def_dxr3='#define CONFIG_DXR3 1' _vosrc="$_vosrc vo_dxr3.c" _vomodules="dxr3 $_vomodules" else - _def_dxr3='#undef HAVE_DXR3' + _def_dxr3='#undef CONFIG_DXR3' _novomodules="dxr3 $_novomodules" fi echores "$_dxr3" @@ -4981,13 +4982,13 @@ EOF cc_check && _ivtv=yes fi if test "$_ivtv" = yes ; then - _def_ivtv='#define HAVE_IVTV 1' + _def_ivtv='#define CONFIG_IVTV 1' _vosrc="$_vosrc vo_ivtv.c" _vomodules="ivtv $_vomodules" _aosrc="$_aosrc ao_ivtv.c" _aomodules="ivtv $_aomodules" else - _def_ivtv='#undef HAVE_IVTV' + _def_ivtv='#undef CONFIG_IVTV' _novomodules="ivtv $_novomodules" _noaomodules="ivtv $_noaomodules" fi @@ -5016,13 +5017,13 @@ EOF cc_check && _v4l2=yes fi if test "$_v4l2" = yes ; then - _def_v4l2='#define HAVE_V4L2_DECODER 1' + _def_v4l2='#define CONFIG_V4L2_DECODER 1' _vosrc="$_vosrc vo_v4l2.c" _vomodules="v4l2 $_vomodules" _aosrc="$_aosrc ao_v4l2.c" _aomodules="v4l2 $_aomodules" else - _def_v4l2='#undef HAVE_V4L2_DECODER' + _def_v4l2='#undef CONFIG_V4L2_DECODER' _novomodules="v4l2 $_novomodules" _noaomodules="v4l2 $_noaomodules" fi @@ -5399,10 +5400,10 @@ fi #if irix echocheck "VCD support" if linux || freebsd || netbsd || dragonfly || bsdos || darwin || sunos || mingw32; then _inputmodules="vcd $_inputmodules" - _def_vcd='#define HAVE_VCD 1' + _def_vcd='#define CONFIG_VCD 1' _vcd="yes" else - _def_vcd='#undef HAVE_VCD' + _def_vcd='#undef CONFIG_VCD' _noinputmodules="vcd $_noinputmodules" _res_comment="not supported on this OS" _vcd="no" @@ -6796,16 +6797,16 @@ if test "$_zr" = auto ; then fi if test "$_zr" = yes ; then if test "$_libavcodec_a" = yes ; then - _def_zr='#define HAVE_ZR 1' + _def_zr='#define CONFIG_ZR 1' _vosrc="$_vosrc vo_zr2.c vo_zr.c jpeg_enc.c" _vomodules="zr zr2 $_vomodules" else _res_comment="libavcodec (static) is required by zr, sorry" _novomodules="zr $_novomodules" - _def_zr='#undef HAVE_ZR' + _def_zr='#undef CONFIG_ZR' fi else - _def_zr='#undef HAVE_ZR' + _def_zr='#undef CONFIG_ZR' _novomodules="zr zr2 $_novomodules" fi echores "$_zr" @@ -6974,10 +6975,10 @@ EOF fi fi if test "$_tv_bsdbt848" = yes ; then - _def_tv_bsdbt848='#define HAVE_TV_BSDBT848 1' + _def_tv_bsdbt848='#define CONFIG_TV_BSDBT848 1' _inputmodules="tv-bsdbt848 $_inputmodules" else - _def_tv_bsdbt848='#undef HAVE_TV_BSDBT848' + _def_tv_bsdbt848='#undef CONFIG_TV_BSDBT848' _noinputmodules="tv-bsdbt848 $_noinputmodules" fi echores "$_tv_bsdbt848" @@ -7001,11 +7002,11 @@ EOF fi if test "$_tv_dshow" = yes ; then _inputmodules="tv-dshow $_inputmodules" - _def_tv_dshow='#define HAVE_TV_DSHOW 1' + _def_tv_dshow='#define CONFIG_TV_DSHOW 1' _ld_extra="$_ld_extra -lole32 -luuid" else _noinputmodules="tv-dshow $_noinputmodules" - _def_tv_dshow='#undef HAVE_TV_DSHOW' + _def_tv_dshow='#undef CONFIG_TV_DSHOW' fi echores "$_tv_dshow" @@ -7025,12 +7026,12 @@ fi if test "$_tv_v4l1" = yes ; then _audio_input=yes _tv_v4l=yes - _def_tv_v4l='#define HAVE_TV_V4L 1' - _def_tv_v4l1='#define HAVE_TV_V4L1 1' + _def_tv_v4l='#define CONFIG_TV_V4L 1' + _def_tv_v4l1='#define CONFIG_TV_V4L1 1' _inputmodules="tv-v4l $_inputmodules" else _noinputmodules="tv-v4l1 $_noinputmodules" - _def_tv_v4l='#undef HAVE_TV_V4L' + _def_tv_v4l='#undef CONFIG_TV_V4L' fi echores "$_tv_v4l1" @@ -7051,12 +7052,12 @@ fi if test "$_tv_v4l2" = yes ; then _audio_input=yes _tv_v4l=yes - _def_tv_v4l='#define HAVE_TV_V4L 1' - _def_tv_v4l2='#define HAVE_TV_V4L2 1' + _def_tv_v4l='#define CONFIG_TV_V4L 1' + _def_tv_v4l2='#define CONFIG_TV_V4L2 1' _inputmodules="tv-v4l2 $_inputmodules" else _noinputmodules="tv-v4l2 $_noinputmodules" - _def_tv_v4l2='#undef HAVE_TV_V4L2' + _def_tv_v4l2='#undef CONFIG_TV_V4L2' fi echores "$_tv_v4l2" @@ -7071,11 +7072,11 @@ if test "$_tv_teletext" = auto ; then fi fi if test "$_tv_teletext" = yes ; then - _def_tv_teletext='#define HAVE_TV_TELETEXT 1' + _def_tv_teletext='#define CONFIG_TV_TELETEXT 1' _inputmodules="tv-teletext $_inputmodules" else _noinputmodules="tv-teletext $_noinputmodules" - _def_tv_teletext='#undef HAVE_TV_TELETEXT' + _def_tv_teletext='#undef CONFIG_TV_TELETEXT' fi echores "$_tv_teletext" @@ -7117,9 +7118,9 @@ EOF fi fi if test "$_radio_v4l2" = yes ; then - _def_radio_v4l2='#define HAVE_RADIO_V4L2 1' + _def_radio_v4l2='#define CONFIG_RADIO_V4L2 1' else - _def_radio_v4l2='#undef HAVE_RADIO_V4L2' + _def_radio_v4l2='#undef CONFIG_RADIO_V4L2' fi echores "$_radio_v4l2" @@ -7136,9 +7137,9 @@ EOF fi fi if test "$_radio_v4l" = yes ; then - _def_radio_v4l='#define HAVE_RADIO_V4L 1' + _def_radio_v4l='#define CONFIG_RADIO_V4L 1' else - _def_radio_v4l='#undef HAVE_RADIO_V4L' + _def_radio_v4l='#undef CONFIG_RADIO_V4L' fi echores "$_radio_v4l" @@ -7159,9 +7160,9 @@ echores "$_radio_bsdbt848" fi #if freebsd || netbsd || openbsd || dragonfly || bsdos && _radio && _radio_bsdbt848 if test "$_radio_bsdbt848" = yes ; then - _def_radio_bsdbt848='#define HAVE_RADIO_BSDBT848 1' + _def_radio_bsdbt848='#define CONFIG_RADIO_BSDBT848 1' else - _def_radio_bsdbt848='#undef HAVE_RADIO_BSDBT848' + _def_radio_bsdbt848='#undef CONFIG_RADIO_BSDBT848' fi if test "$_radio_v4l" = no && test "$_radio_v4l2" = no && \ @@ -7184,11 +7185,11 @@ EOF fi fi if test "$_pvr" = yes ; then - _def_pvr='#define HAVE_PVR 1' + _def_pvr='#define CONFIG_PVR 1' _inputmodules="pvr $_inputmodules" else _noinputmodules="pvr $_noinputmodules" - _def_pvr='#undef HAVE_PVR' + _def_pvr='#undef CONFIG_PVR' fi echores "$_pvr" @@ -8676,7 +8677,7 @@ $_def_ivtv $_def_v4l2 $_def_dvb $_def_dvb_head -$_def_dvb_in +$_def_dvbin $_def_svga $_def_vesa $_def_xss @@ -63,7 +63,7 @@ char * gtkAOALSAMixer; char * gtkAOALSAMixerChannel; char * gtkAOALSADevice; #endif -#ifdef HAVE_SDL +#ifdef CONFIG_SDL char * gtkAOSDLDriver; #endif #ifdef CONFIG_ESD @@ -76,7 +76,7 @@ int gtkCacheSize = 2048; int gtkAutoSyncOn = 0; int gtkAutoSync = 0; -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 char * gtkDXR3Device; |