Sun Aug 3 17:21:40 CEST 2008

Author: diego
Date: Sun Aug  3 17:21:40 2008
New Revision: 27402

Log:
Change a bunch of video/audio-output-specific preprocessor directives from
a HAVE_ prefix to a CONFIG_ prefix.


Modified:
   trunk/Makefile
   trunk/cfg-common-opts.h
   trunk/cfg-common.h
   trunk/cfg-mplayer.h
   trunk/command.c
   trunk/configure
   trunk/gui/cfg.c
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/mplayer/gtk/menu.c
   trunk/gui/mplayer/gtk/opts.c
   trunk/gui/mplayer/gui_common.c
   trunk/gui/mplayer/mw.c
   trunk/gui/mplayer/play.c
   trunk/input/input.c
   trunk/libao2/audio_out.c
   trunk/libmenu/menu.c
   trunk/libmpcodecs/vd.c
   trunk/libmpcodecs/vf.c
   trunk/libmpdemux/demuxer.h
   trunk/libvo/sub.c
   trunk/libvo/video_out.c
   trunk/libvo/vo_macosx.m
   trunk/libvo/vo_quartz.c
   trunk/mp_core.h
   trunk/mpcommon.c
   trunk/mplayer.c
   trunk/stream/dvb_tune.c
   trunk/stream/dvbin.h
   trunk/stream/stream.c
   trunk/stream/stream_dvb.c
   trunk/stream/stream_radio.c
   trunk/stream/stream_radio.h
   trunk/stream/tv.c
   trunk/stream/tvi_dshow.c
   trunk/stream/tvi_v4l.c
   trunk/stream/tvi_v4l2.c

Changes in other areas also in this revision:
Modified:
   trunk/help/help_mp-bg.h
   trunk/help/help_mp-cs.h
   trunk/help/help_mp-de.h
   trunk/help/help_mp-dk.h
   trunk/help/help_mp-el.h
   trunk/help/help_mp-en.h
   trunk/help/help_mp-es.h
   trunk/help/help_mp-fr.h
   trunk/help/help_mp-hu.h
   trunk/help/help_mp-it.h
   trunk/help/help_mp-ja.h
   trunk/help/help_mp-ko.h
   trunk/help/help_mp-mk.h
   trunk/help/help_mp-nl.h
   trunk/help/help_mp-pl.h
   trunk/help/help_mp-pt_BR.h
   trunk/help/help_mp-ro.h
   trunk/help/help_mp-ru.h
   trunk/help/help_mp-sk.h
   trunk/help/help_mp-sv.h
   trunk/help/help_mp-tr.h
   trunk/help/help_mp-uk.h
   trunk/help/help_mp-zh_CN.h
   trunk/help/help_mp-zh_TW.h

Modified: trunk/Makefile
==============================================================================

--- trunk/Makefile	(original)
+++ trunk/Makefile	Sun Aug  3 17:21:40 2008
@@ -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 $@
 

Modified: trunk/cfg-common-opts.h
==============================================================================
--- trunk/cfg-common-opts.h	(original)
+++ trunk/cfg-common-opts.h	Sun Aug  3 17:21:40 2008
@@ -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
 

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	(original)
+++ trunk/cfg-common.h	Sun Aug  3 17:21:40 2008
@@ -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

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	(original)
+++ trunk/cfg-mplayer.h	Sun Aug  3 17:21:40 2008
@@ -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
 

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	(original)
+++ trunk/command.c	Sun Aug  3 17:21:40 2008
@@ -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
 
 #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_o
 }
 
 
-#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_cm
 	    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_cm
 			//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_cm
                                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_cm
 		    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_cm
 		    //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_cm
 			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_cm
 		    //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_cm
 	    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_cm
 		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:

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sun Aug  3 17:21:40 2008
@@ -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

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	(original)
+++ trunk/gui/cfg.c	Sun Aug  3 17:21:40 2008
@@ -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;
 #endif
 
@@ -111,7 +111,7 @@ static const m_option_t gui_opts[] =
  { "vo_panscan",&vo_panscan,CONF_TYPE_FLOAT,CONF_RANGE,0.0,1.0,NULL },
  { "vo_doublebuffering",&vo_doublebuffering,CONF_TYPE_FLAG,0,0,1,NULL },
  { "vo_direct_render",&vo_directrendering,CONF_TYPE_FLAG,0,0,1,NULL },
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
  { "vo_dxr3_device",&gtkDXR3Device,CONF_TYPE_STRING,0,0,0,NULL },
 #endif
 
@@ -144,7 +144,7 @@ static const m_option_t gui_opts[] =
  { "ao_alsa_mixer_channel",&gtkAOALSAMixerChannel,CONF_TYPE_STRING,0,0,0,NULL },
  { "ao_alsa_device",&gtkAOALSADevice,CONF_TYPE_STRING,0,0,0,NULL },
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
  { "ao_sdl_subdriver",&gtkAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL },
 #endif
 #ifdef CONFIG_ESD

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	(original)
+++ trunk/gui/interface.c	Sun Aug  3 17:21:40 2008
@@ -185,7 +185,7 @@ void guiInit( void )
  guiIntfStruct.StreamType=-1;
 
  memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
  if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" );
 #endif
  if ( stream_cache_size > 0 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; }
@@ -616,7 +616,7 @@ int guiGetEvent( int type,char * arg )
 	       guiGetEvent( guiSetDVD,(char *)stream->priv );
 	       break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 	  case STREAMTYPE_VCD: 
 	       {
 	        int i;
@@ -706,7 +706,7 @@ int guiGetEvent( int type,char * arg )
 	     }
 	 }
 // -- subtitle
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 	if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS
 #ifdef CONFIG_LIBAVCODEC
 	 && !gtkVfLAVC
@@ -743,7 +743,7 @@ int guiGetEvent( int type,char * arg )
          {
 	  case STREAMTYPE_PLAYLIST:
 	       break;
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 	  case STREAMTYPE_VCD:
 	       {
 	        char tmp[512];
@@ -795,7 +795,7 @@ int guiGetEvent( int type,char * arg )
 	   }
 	}
 
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 #ifdef CONFIG_LIBAVCODEC
 	remove_vf( "lavc" );
 #endif
@@ -857,7 +857,7 @@ int guiGetEvent( int type,char * arg )
 	  free(tmp);
 	 }
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
 	if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"sdl",3 ) )
 	 {
 	  char *tmp;
@@ -1125,7 +1125,7 @@ void * gtkSet( int cmd,float fparam, voi
 #ifdef CONFIG_DVDREAD
 	if ( (unsigned int)vparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) );
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 	if ( (unsigned int)vparam & guiVCD ) guiIntfStruct.VCDTracks=0;
 #endif
 	return NULL;

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	(original)
+++ trunk/gui/interface.h	Sun Aug  3 17:21:40 2008
@@ -90,7 +90,7 @@ typedef struct
    int			Chapter;
 #endif
 
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    int    VCDTracks;
 #endif
 

Modified: trunk/gui/mplayer/gtk/menu.c
==============================================================================
--- trunk/gui/mplayer/gtk/menu.c	(original)
+++ trunk/gui/mplayer/gtk/menu.c	Sun Aug  3 17:21:40 2008
@@ -72,7 +72,7 @@
 #include "../pixmaps/tonguebla.xpm"
 #include "../pixmaps/empty1px.xpm"
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
 #include "../pixmaps/vcd.xpm"
 #include "../pixmaps/playvcd.xpm"
 #endif
@@ -421,7 +421,7 @@ GtkWidget * create_PopUpMenu( void )
   AddSeparator( Menu );
    SubMenu=AddSubMenu( window1, (const char*)open_xpm, Menu,MSGTR_MENU_Open );
     AddMenuItem( window1, (const char*)file2_xpm, SubMenu,MSGTR_MENU_PlayFile"    ", evLoadPlay );
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
     AddMenuItem( window1, (const char*)playvcd_xpm, SubMenu,MSGTR_MENU_PlayVCD, evPlayVCD );
 #endif
 #ifdef CONFIG_DVDREAD
@@ -446,7 +446,7 @@ GtkWidget * create_PopUpMenu( void )
 //    AddMenuItem( SubMenu,MSGTR_MENU_NormalSize"      ", evNormalSize );
 //    AddMenuItem( SubMenu,MSGTR_MENU_DoubleSize, evDoubleSize );
 //    AddMenuItem( SubMenu,MSGTR_MENU_FullScreen, evFullScreen );
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    VCDSubMenu=AddSubMenu( window1, (const char*)vcd_xpm, Menu,MSGTR_MENU_VCD );
     AddMenuItem( window1, (const char*)playvcd_xpm, VCDSubMenu,MSGTR_MENU_PlayDisc,evPlayVCD );
     AddSeparator( VCDSubMenu );

Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c	(original)
+++ trunk/gui/mplayer/gtk/opts.c	Sun Aug  3 17:21:40 2008
@@ -178,7 +178,7 @@ static char * ao_driver[3];
 static char * vo_driver[3];
 static int    old_video_driver = 0;
 
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
  void ShowDXR3Config( void );
  void HideDXR3Config( void );
 #endif
@@ -271,7 +271,7 @@ void ShowPreferences( void )
   gtk_clist_select_row( GTK_CLIST( CLVDrivers ),old_video_driver,0 );
   gtk_clist_get_text( GTK_CLIST( CLVDrivers ),old_video_driver,0,(char **)&vo_driver );
   gtk_widget_set_sensitive( VConfig,FALSE );
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
   if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE );
 #endif
  }
@@ -487,7 +487,7 @@ void HidePreferences( void )
  gtk_widget_destroy( Preferences );
  Preferences=NULL;
  HideAudioConfig();
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
  HideDXR3Config();
 #endif
 }
@@ -649,7 +649,7 @@ void prButton( GtkButton * button,gpoint
    case bVconfig:
 	if ( !vo_driver[0] ) break;
         gtk_widget_set_sensitive( VConfig,FALSE );
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 	if ( !gstrcmp( vo_driver[0],"dxr3" ) ) { ShowDXR3Config(); gtk_widget_set_sensitive( VConfig,TRUE ); }
 #endif
 	break;
@@ -790,7 +790,7 @@ static void prCListRow( GtkCList * clist
    case 1: // video driver 
 	gtk_clist_get_text( GTK_CLIST( CLVDrivers ),row,0,(char **)&vo_driver ); 
 	gtk_widget_set_sensitive( VConfig,FALSE );
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 	if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE );
 #endif
 	break;
@@ -1388,7 +1388,7 @@ GList *appendOSSDevices(GList *l) {
     l = g_list_append(l, (gpointer)"/dev/dsp2");
     l = g_list_append(l, (gpointer)"/dev/dsp3");
   }
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
   l = g_list_append(l, (gpointer)"/dev/em8300_ma");
   l = g_list_append(l, (gpointer)"/dev/em8300_ma-0");
   l = g_list_append(l, (gpointer)"/dev/em8300_ma-1");
@@ -1450,7 +1450,7 @@ GList *appendALSAMixerChannels(GList *l)
 }
 #endif
 
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
 GList *appendSDLDevices(GList *l) {
   l = g_list_append(l, (gpointer)"alsa");
   l = g_list_append(l, (gpointer)"arts");
@@ -1517,7 +1517,7 @@ void ShowAudioConfig() {
     setGtkEntryText(CEAudioMixerChannel, gtkAOALSAMixerChannel);
   }
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
   if (strncmp(ao_driver[0], "sdl", 3) == 0) {
     setGtkEntryText(CEAudioDevice, gtkAOSDLDriver);
   }
@@ -1562,7 +1562,7 @@ static void audioButton(GtkButton *butto
         gtkAOALSAMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel));
       }
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
       if (strncmp(ao_driver[0], "sdl", 3) == 0) {
         gfree(&gtkAOSDLDriver);
         gtkAOSDLDriver = gstrdup(getGtkEntryText(CEAudioDevice));
@@ -1620,7 +1620,7 @@ GtkWidget *create_AudioConfig() {
   if (strncmp(ao_driver[0], "alsa", 4) == 0)
     items = appendALSADevices(items);
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
   if (strncmp(ao_driver[0], "sdl", 3) == 0)
     items = appendSDLDevices(items);
 #endif
@@ -1700,7 +1700,7 @@ GtkWidget *create_AudioConfig() {
   return AudioConfig;
 }
 
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 // --- dxr3 config box
 
 static GtkWidget * DXR3Config;

Modified: trunk/gui/mplayer/gui_common.c
==============================================================================
--- trunk/gui/mplayer/gui_common.c	(original)
+++ trunk/gui/mplayer/gui_common.c	Sun Aug  3 17:21:40 2008
@@ -77,7 +77,7 @@ static inline void TranslateFilename( in
             else av_strlcat( tmp,MSGTR_NoChapter,tmplen );
           break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    case STREAMTYPE_VCD:
         snprintf( tmp,tmplen,MSGTR_VCDTrack,guiIntfStruct.Track );
 	break;
@@ -174,7 +174,7 @@ calclengthmmmmss:
            switch ( guiIntfStruct.StreamType )
             {
              case STREAMTYPE_FILE:   av_strlcat( trbuf,"f",sizeof( trbuf ) ); break;
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
              case STREAMTYPE_VCD:    av_strlcat( trbuf,"v",sizeof( trbuf ) ); break;
 #endif
              case STREAMTYPE_STREAM: av_strlcat( trbuf,"u",sizeof( trbuf ) ); break;

Modified: trunk/gui/mplayer/mw.c
==============================================================================
--- trunk/gui/mplayer/mw.c	(original)
+++ trunk/gui/mplayer/mw.c	Sun Aug  3 17:21:40 2008
@@ -128,7 +128,7 @@ void mplEventHandling( int msg,float par
         mp_property_do("sub",M_PROPERTY_SET,&iparam,guiIntfStruct.mpcontext); 
 	break;
 
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    case evSetVCDTrack:
         guiIntfStruct.Track=iparam;
    case evPlayVCD:
@@ -165,7 +165,7 @@ play:
 	  case STREAMTYPE_FILE:
 	       gtkSet( gtkClearStruct,0,(void *)(guiALL - guiFilenames) );
 	       break;
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
           case STREAMTYPE_VCD:
 	       gtkSet( gtkClearStruct,0,(void *)(guiALL - guiVCD - guiFilenames) );
 	       if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE );

Modified: trunk/gui/mplayer/play.c
==============================================================================
--- trunk/gui/mplayer/play.c	(original)
+++ trunk/gui/mplayer/play.c	Sun Aug  3 17:21:40 2008
@@ -296,7 +296,7 @@ void mplCurr( void )
    case STREAMTYPE_DVD:
 	break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    case STREAMTYPE_VCD:
 	break;
 #endif
@@ -332,7 +332,7 @@ void mplPrev( void )
 	guiIntfStruct.Track=guiIntfStruct.DVD.current_title;
 	break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    case STREAMTYPE_VCD:
 	if ( --guiIntfStruct.Track == 0 ) { guiIntfStruct.Track=1; stop=1; }
 	break;
@@ -368,7 +368,7 @@ void mplNext( void )
 	guiIntfStruct.Track=guiIntfStruct.DVD.current_title;
 	break;
 #endif
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
    case STREAMTYPE_VCD:
 	if ( ++guiIntfStruct.Track > guiIntfStruct.VCDTracks ) { guiIntfStruct.Track=guiIntfStruct.VCDTracks; stop=1; }
 	break;

Modified: trunk/input/input.c
==============================================================================
--- trunk/input/input.c	(original)
+++ trunk/input/input.c	Sun Aug  3 17:21:40 2008
@@ -138,7 +138,7 @@ static const mp_cmd_t mp_cmds[] = {
   { MP_CMD_TV_SET_SATURATION, "tv_set_saturation", 1,  { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT,{1} }, {-1,{0}} }},
 #endif
   { MP_CMD_SUB_FORCED_ONLY, "forced_subs_only",  0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
   { MP_CMD_DVB_SET_CHANNEL, "dvb_set_channel", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}}}},
 #endif
   { MP_CMD_SWITCH_RATIO, "switch_ratio", 0, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
@@ -154,7 +154,7 @@ static const mp_cmd_t mp_cmds[] = {
   { MP_CMD_LOADLIST, "loadlist", 1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
   { MP_CMD_RUN, "run", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
   { MP_CMD_VF_CHANGE_RECTANGLE, "change_rectangle", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}}}},
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
   { MP_CMD_TV_TELETEXT_ADD_DEC, "teletext_add_dec", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
   { MP_CMD_TV_TELETEXT_GO_LINK, "teletext_go_link", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
 #endif
@@ -421,7 +421,7 @@ static const mp_cmd_bind_t def_cmd_binds
   { { 'n', 0 }, "tv_step_norm" },
   { { 'u', 0 }, "tv_step_chanlist" },
 #endif
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
   { { 'X', 0 }, "step_property teletext_mode 1" },
   { { 'W', 0 }, "step_property teletext_page 1" },
   { { 'Q', 0 }, "step_property teletext_page -1" },

Modified: trunk/libao2/audio_out.c
==============================================================================
--- trunk/libao2/audio_out.c	(original)
+++ trunk/libao2/audio_out.c	Sun Aug  3 17:21:40 2008
@@ -79,20 +79,20 @@ const ao_functions_t* const audio_out_dr
 #ifdef HAVE_NAS
         &audio_out_nas,
 #endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
         &audio_out_sdl,
 #endif
 #ifdef CONFIG_OPENAL
         &audio_out_openal,
 #endif
         &audio_out_mpegpes,
-#ifdef HAVE_DXR2
+#ifdef CONFIG_DXR2
         &audio_out_dxr2,
 #endif
-#ifdef HAVE_IVTV
+#ifdef CONFIG_IVTV
         &audio_out_ivtv,
 #endif
-#ifdef HAVE_V4L2_DECODER
+#ifdef CONFIG_V4L2_DECODER
         &audio_out_v4l2,
 #endif
         &audio_out_null,

Modified: trunk/libmenu/menu.c
==============================================================================
--- trunk/libmenu/menu.c	(original)
+++ trunk/libmenu/menu.c	Sun Aug  3 17:21:40 2008
@@ -40,7 +40,7 @@ menu_info_t* menu_info_list[] = {
   &menu_info_filesel,
   &menu_info_txt,
   &menu_info_console,
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
   &menu_info_dvbsel,
 #endif  
   &menu_info_pref,

Modified: trunk/libmpcodecs/vd.c
==============================================================================
--- trunk/libmpcodecs/vd.c	(original)
+++ trunk/libmpcodecs/vd.c	Sun Aug  3 17:21:40 2008
@@ -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

Modified: trunk/libmpcodecs/vf.c
==============================================================================
--- trunk/libmpcodecs/vf.c	(original)
+++ trunk/libmpcodecs/vf.c	Sun Aug  3 17:21:40 2008
@@ -128,7 +128,7 @@ static const vf_info_t* const filter_lis
     &vf_info_lavcdeint,
     &vf_info_screenshot,
 #endif
-#ifdef HAVE_ZR
+#ifdef CONFIG_ZR
     &vf_info_zrmjpeg,
 #endif
     &vf_info_dvbscale,

Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h	(original)
+++ trunk/libmpdemux/demuxer.h	Sun Aug  3 17:21:40 2008
@@ -12,7 +12,7 @@
 #endif
 
 #define MAX_PACKS 4096
-#ifdef HAVE_TV_BSDBT848
+#ifdef CONFIG_TV_BSDBT848
 #define MAX_PACK_BYTES 0x2000000
 #else
 #define MAX_PACK_BYTES 0x800000

Modified: trunk/libvo/sub.c
==============================================================================
--- trunk/libvo/sub.c	(original)
+++ trunk/libvo/sub.c	Sun Aug  3 17:21:40 2008
@@ -14,7 +14,7 @@
 #define OSD_NAV_BOX_ALPHA 0x7f
 #endif
 
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 #include "stream/tv.h"
 #include "osdep/timer.h"
 #endif
@@ -73,7 +73,7 @@ font_desc_t* vo_font=NULL;
 font_desc_t* sub_font=NULL;
 
 unsigned char* vo_osd_text=NULL;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 void* vo_osd_teletext_page=NULL;
 int vo_osd_teletext_half = 0;
 int vo_osd_teletext_mode=0;
@@ -242,7 +242,7 @@ inline static void vo_update_nav (mp_osd
 }
 #endif
 
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 // renders char to a big per-object buffer where alpha and bitmap are separated
 static void tt_draw_alpha_buf(mp_osd_obj_t* obj, int x0,int y0, int w,int h, unsigned char* src, int stride,int fg,int bg,int alpha)
 {
@@ -1123,7 +1123,7 @@ int vo_update_osd(int dxs,int dys){
 	case OSDTYPE_SUBTITLE:
 	    vo_update_text_sub(obj,dxs,dys);
 	    break;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 	case OSDTYPE_TELETEXT:
 	    vo_update_text_teletext(obj,dxs,dys);
 	    break;
@@ -1195,7 +1195,7 @@ void vo_init_osd(void){
 #ifdef CONFIG_DVDNAV
     new_osd_obj(OSDTYPE_DVDNAV);
 #endif
-#if HAVE_TV_TELETEXT
+#if CONFIG_TV_TELETEXT
     new_osd_obj(OSDTYPE_TELETEXT);
 #endif
 #ifdef HAVE_FREETYPE
@@ -1236,7 +1236,7 @@ void vo_draw_text(int dxs,int dys,void (
 #ifdef CONFIG_DVDNAV
         case OSDTYPE_DVDNAV:
 #endif
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 	case OSDTYPE_TELETEXT:
 #endif
 	case OSDTYPE_OSD:

Modified: trunk/libvo/video_out.c
==============================================================================
--- trunk/libvo/video_out.c	(original)
+++ trunk/libvo/video_out.c	Sun Aug  3 17:21:40 2008
@@ -178,19 +178,19 @@ const vo_functions_t* const video_out_dr
 #ifdef CONFIG_CACA
 	&video_out_caca,
 #endif
-#ifdef HAVE_DXR2
+#ifdef CONFIG_DXR2
 	&video_out_dxr2,
 #endif
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 	&video_out_dxr3,
 #endif
-#ifdef HAVE_IVTV
+#ifdef CONFIG_IVTV
         &video_out_ivtv,
 #endif
-#ifdef HAVE_V4L2_DECODER
+#ifdef CONFIG_V4L2_DECODER
         &video_out_v4l2,
 #endif
-#ifdef HAVE_ZR
+#ifdef CONFIG_ZR
 	&video_out_zr,
 	&video_out_zr2,
 #endif

Modified: trunk/libvo/vo_macosx.m
==============================================================================
--- trunk/libvo/vo_macosx.m	(original)
+++ trunk/libvo/vo_macosx.m	Sun Aug  3 17:21:40 2008
@@ -326,7 +326,7 @@ static int preinit(const char *arg)
 	
 	if(!shared_buffer)
 	{
-		#if !defined (MACOSX_FINDER_SUPPORT) || !defined (HAVE_SDL)
+		#if !defined (MACOSX_FINDER_SUPPORT) || !defined (CONFIG_SDL)
 		//this chunk of code is heavily based off SDL_macosx.m from SDL 
 		//it uses an Apple private function to request foreground operation
 		void CPSEnableForegroundOperation(ProcessSerialNumber* psn);
@@ -913,7 +913,7 @@ static int control(uint32_t request, voi
 	// Without SDL's bootstrap code (include SDL.h in mplayer.c),
 	// on Leopard, we got trouble to get the play window auto focused
 	// when app is actived. Following code fix this problem.
-#ifndef HAVE_SDL
+#ifndef CONFIG_SDL
 	if (isLeopardOrLater && [event type] == NSAppKitDefined
 			&& [event subtype] == NSApplicationActivatedEventType) {
 		[window makeMainWindow];

Modified: trunk/libvo/vo_quartz.c
==============================================================================
--- trunk/libvo/vo_quartz.c	(original)
+++ trunk/libvo/vo_quartz.c	Sun Aug  3 17:21:40 2008
@@ -1141,7 +1141,7 @@ static int preinit(const char *arg)
         }
     }
 	
-#if !defined (MACOSX_FINDER_SUPPORT) || !defined (HAVE_SDL)
+#if !defined (MACOSX_FINDER_SUPPORT) || !defined (CONFIG_SDL)
 	//this chunk of code is heavily based off SDL_macosx.m from SDL 
 	//it uses an Apple private function to request foreground operation
 {

Modified: trunk/mp_core.h
==============================================================================
--- trunk/mp_core.h	(original)
+++ trunk/mp_core.h	Sun Aug  3 17:21:40 2008
@@ -92,7 +92,7 @@ typedef struct MPContext {
 
     int file_format;
 
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
     int last_dvb_step;
     int dvbin_reopen;
 #endif

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	(original)
+++ trunk/mpcommon.c	Sun Aug  3 17:21:40 2008
@@ -7,7 +7,7 @@
 #include "libvo/video_out.h"
 #include "spudec.h"
 #include "vobsub.h"
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 #include "stream/tv.h"
 #endif
 #include "libavutil/intreadwrite.h"
@@ -165,7 +165,7 @@ void update_subtitles(sh_video_t *sh_vid
 
 void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset)
 {
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
     tvi_handle_t* tvh=demuxer->priv;
     int page_changed;
 

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Sun Aug  3 17:21:40 2008
@@ -112,7 +112,7 @@ char *heartbeat_cmd;
 #include "stream/stream_radio.h"
 #endif
 
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 #include "stream/dvbin.h"
 #include "stream/cache2.h"
 #endif
@@ -198,7 +198,7 @@ static MPContext mpctx_s = {
     .set_of_sub_pos = -1,
     .file_format = DEMUXER_TYPE_UNKNOWN,
     .loop_times = -1,
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
     .last_dvb_step = 1,
 #endif
 };
@@ -1143,7 +1143,7 @@ void init_vo_spudec(void) {
  * make it all work is to use the builtin SDL-bootstrap code, which 
  * will be done automatically by replacing our main() if we include SDL.h.
  */
-#if defined(__APPLE__) && defined(HAVE_SDL)
+#if defined(__APPLE__) && defined(CONFIG_SDL)
 #include <SDL.h>
 #endif
 
@@ -3410,7 +3410,7 @@ if(mpctx->sh_video){
 
 if(!mpctx->sh_video && !mpctx->sh_audio){
     mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NoStreamFound);
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 	if(mpctx->stream->type == STREAMTYPE_DVB)
 	{
 		int dir;
@@ -3918,7 +3918,7 @@ if(rel_seek_secs || abs_seek_pos){
 
 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d  \n",mpctx->eof);
 
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
 if(mpctx->dvbin_reopen)
 {
   mpctx->eof = 0;

Modified: trunk/stream/dvb_tune.c
==============================================================================
--- trunk/stream/dvb_tune.c	(original)
+++ trunk/stream/dvb_tune.c	Sun Aug  3 17:21:40 2008
@@ -34,7 +34,7 @@
 #include <errno.h>
 #include "config.h"
 
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	#include <linux/dvb/dmx.h>
 	#include <linux/dvb/frontend.h>
 #else
@@ -50,7 +50,7 @@
 
 int dvb_get_tuner_type(int fe_fd)
 {
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
   struct dvb_frontend_info fe_info;
 #else
   FrontendInfo fe_info;
@@ -98,7 +98,7 @@ int dvb_open_devices(dvb_priv_t *priv, i
 	int i;
 	char frontend_dev[32], dvr_dev[32], demux_dev[32], sec_dev[32];
 
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	sprintf(frontend_dev, "/dev/dvb/adapter%d/frontend0", n);
 	sprintf(dvr_dev, "/dev/dvb/adapter%d/dvr0", n);
 	sprintf(demux_dev, "/dev/dvb/adapter%d/demux0", n);
@@ -114,7 +114,7 @@ int dvb_open_devices(dvb_priv_t *priv, i
 		mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING FRONTEND DEVICE %s: ERRNO %d\n", frontend_dev, errno);
 		return 0;
 	}
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	priv->sec_fd=0;
 #else
 	priv->sec_fd = open(sec_dev, O_RDWR);
@@ -159,7 +159,7 @@ int dvb_fix_demuxes(dvb_priv_t *priv, in
 	int i;
 	char demux_dev[32];
 
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	sprintf(demux_dev, "/dev/dvb/adapter%d/demux0", priv->card);
 #else
 	sprintf(demux_dev, "/dev/ost/demux%d", priv->card);
@@ -202,7 +202,7 @@ int dvb_set_ts_filt(int fd, uint16_t pid
 	pesFilterParams.pid     = pid;
 	pesFilterParams.input   = DMX_IN_FRONTEND;
 	pesFilterParams.output  = DMX_OUT_TS_TAP;
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	pesFilterParams.pes_type = pestype;
 #else
 	pesFilterParams.pesType = pestype;
@@ -268,7 +268,7 @@ int dvb_tune(dvb_priv_t *priv, int freq,
 }
 
 
-#ifndef HAVE_DVB_HEAD
+#ifndef CONFIG_DVB_HEAD
 static int SecGetStatus (int fd, struct secStatus *state)
 {
     if(ioctl(fd, SEC_GET_STATUS, state) < 0)
@@ -331,7 +331,7 @@ static void print_status(fe_status_t fes
 {
 	mp_msg(MSGT_DEMUX, MSGL_V, "FE_STATUS:");
 	if (festatus & FE_HAS_SIGNAL) mp_msg(MSGT_DEMUX, MSGL_V," FE_HAS_SIGNAL");
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	if (festatus & FE_TIMEDOUT) mp_msg(MSGT_DEMUX, MSGL_V, " FE_TIMEDOUT");
 #else
 	if (festatus & FE_HAS_POWER) mp_msg(MSGT_DEMUX, MSGL_V, " FE_HAS_POWER");
@@ -346,7 +346,7 @@ static void print_status(fe_status_t fes
 }
 
 
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 static int check_status(int fd_frontend, int tmout)
 {
 	int32_t strength;
@@ -500,7 +500,7 @@ static int check_status(int fd_frontend,
 }
 #endif
 
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 
 struct diseqc_cmd {
    struct dvb_diseqc_master_cmd cmd;
@@ -585,7 +585,7 @@ static int tune_it(int fd_frontend, int 
 	fe_code_rate_t LP_CodeRate, fe_hierarchy_t hier, int timeout)
 {
   int res, hi_lo, dfd;
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
   struct dvb_frontend_parameters feparams;
   struct dvb_frontend_info fe_info;
 #else
@@ -608,14 +608,14 @@ static int tune_it(int fd_frontend, int 
   }
 
 
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
   mp_msg(MSGT_DEMUX, MSGL_V, "Using DVB card \"%s\"\n", fe_info.name);
 #endif
 
   switch(fe_info.type)
   {
     case FE_OFDM:
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
       if (freq < 1000000) freq*=1000UL;
       feparams.frequency=freq;
       feparams.inversion=specInv;
@@ -646,7 +646,7 @@ static int tune_it(int fd_frontend, int 
         // this must be an absolute frequency
         if (freq < SLOF)
         {
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
           freq = feparams.frequency=(freq-LOF1);
 #else
           freq = feparams.Frequency=(freq-LOF1);
@@ -655,7 +655,7 @@ static int tune_it(int fd_frontend, int 
         }
         else
         {
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
           freq = feparams.frequency=(freq-LOF2);
 #else
           freq = feparams.Frequency=(freq-LOF2);
@@ -666,14 +666,14 @@ static int tune_it(int fd_frontend, int 
       else
       {
         // this is an L-Band frequency
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
        feparams.frequency=freq;
 #else
        feparams.Frequency=freq;
 #endif
       }
 
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
       feparams.inversion=specInv;
       feparams.u.qpsk.symbol_rate=srate;
       feparams.u.qpsk.fec_inner=HP_CodeRate;
@@ -697,7 +697,7 @@ static int tune_it(int fd_frontend, int 
       break;
     case FE_QAM:
       mp_msg(MSGT_DEMUX, MSGL_V, "tuning DVB-C to %d, srate=%d\n",freq,srate);
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
       feparams.frequency=freq;
       feparams.inversion=specInv;
       feparams.u.qam.symbol_rate = srate;
@@ -724,7 +724,7 @@ static int tune_it(int fd_frontend, int 
   }
   usleep(100000);
 
-#ifndef HAVE_DVB_HEAD
+#ifndef CONFIG_DVB_HEAD
   if (fd_sec) SecGetStatus(fd_sec, &sec_state);
   while(1)
   {

Modified: trunk/stream/dvbin.h
==============================================================================
--- trunk/stream/dvbin.h	(original)
+++ trunk/stream/dvbin.h	Sun Aug  3 17:21:40 2008
@@ -14,7 +14,7 @@
 #define LOF1 (9750*1000UL)
 #define LOF2 (10600*1000UL)
 
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 	#include <linux/dvb/dmx.h>
 	#include <linux/dvb/frontend.h>
 	#include <linux/dvb/version.h>

Modified: trunk/stream/stream.c
==============================================================================
--- trunk/stream/stream.c	(original)
+++ trunk/stream/stream.c	Sun Aug  3 17:21:40 2008
@@ -65,7 +65,7 @@ extern const stream_info_t stream_info_i
 extern const stream_info_t stream_info_dvd;
 
 static const stream_info_t* const auto_open_streams[] = {
-#ifdef HAVE_VCD
+#ifdef CONFIG_VCD
   &stream_info_vcd,
 #endif
 #ifdef HAVE_CDDA
@@ -85,7 +85,7 @@ static const stream_info_t* const auto_o
   &stream_info_udp,
   &stream_info_http2,
 #endif
-#ifdef HAS_DVBIN_SUPPORT
+#ifdef CONFIG_DVBIN
   &stream_info_dvb,
 #endif
 #ifdef CONFIG_TV
@@ -94,7 +94,7 @@ static const stream_info_t* const auto_o
 #ifdef CONFIG_RADIO
   &stream_info_radio,
 #endif
-#ifdef HAVE_PVR
+#ifdef CONFIG_PVR
   &stream_info_pvr,
 #endif
 #ifdef HAVE_FTP

Modified: trunk/stream/stream_dvb.c
==============================================================================
--- trunk/stream/stream_dvb.c	(original)
+++ trunk/stream/stream_dvb.c	Sun Aug  3 17:21:40 2008
@@ -288,7 +288,7 @@ static dvb_channels_list *dvb_get_channe
 				ptr->cr =FEC_2_3;
 			else if(! strcmp(cr, "FEC_3_4"))
 				ptr->cr =FEC_3_4;
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 			else if(! strcmp(cr, "FEC_4_5"))
 				ptr->cr =FEC_4_5;
 			else if(! strcmp(cr, "FEC_6_7"))
@@ -358,7 +358,7 @@ static dvb_channels_list *dvb_get_channe
 				ptr->cr_lp =FEC_2_3;
 			else if(! strcmp(tmp_lcr, "FEC_3_4"))
 				ptr->cr_lp =FEC_3_4;
-#ifdef HAVE_DVB_HEAD
+#ifdef CONFIG_DVB_HEAD
 			else if(! strcmp(tmp_lcr, "FEC_4_5"))
 				ptr->cr_lp =FEC_4_5;
 			else if(! strcmp(tmp_lcr, "FEC_6_7"))
@@ -381,7 +381,7 @@ static dvb_channels_list *dvb_get_channe
 				ptr->hier = HIERARCHY_2;
 			else if(! strcmp(tmp_hier, "HIERARCHY_4"))
 				ptr->hier = HIERARCHY_4;
-#ifdef HAVE_DVB_HEAD				
+#ifdef CONFIG_DVB_HEAD
 			else if(! strcmp(tmp_hier, "HIERARCHY_AUTO"))
 				ptr->hier = HIERARCHY_AUTO;
 #endif
@@ -611,7 +611,7 @@ static void dvbin_close(stream_t *stream
 	close(priv->dvr_fd);
 
 	close(priv->fe_fd);
-#ifdef HAVE_DVB
+#ifdef CONFIG_DVB
 	close(priv->sec_fd);
 #endif
 

Modified: trunk/stream/stream_radio.c
==============================================================================
--- trunk/stream/stream_radio.c	(original)
+++ trunk/stream/stream_radio.c	Sun Aug  3 17:21:40 2008
@@ -35,21 +35,21 @@
 #include <errno.h>
 #include <unistd.h>
 
-#ifdef HAVE_RADIO_BSDBT848
+#ifdef CONFIG_RADIO_BSDBT848
 #include <sys/param.h>
 #ifdef IOCTL_BT848_H_NAME
 #include IOCTL_BT848_H_NAME
 #endif
 
-#else // HAVE_RADIO_BSDBT848
+#else /* CONFIG_RADIO_BSDBT848 */
 
 #include <linux/types.h>
 
-#ifdef HAVE_RADIO_V4L2
+#ifdef CONFIG_RADIO_V4L2
 #include <linux/videodev2.h>
 #endif
 
-#ifdef HAVE_RADIO_V4L
+#ifdef CONFIG_RADIO_V4L
 #include <linux/videodev.h>
 #warning  "V4L is deprecated and will be removed in future"
 #endif
@@ -91,7 +91,7 @@ typedef struct radio_channels_s {
 
 /// default values for options
 radio_param_t stream_radio_defaults={
-#ifdef HAVE_RADIO_BSDBT848
+#ifdef CONFIG_RADIO_BSDBT848
     "/dev/tuner0", //device
     87.50,         //freq_min
     108.00,        //freq_max
@@ -252,7 +252,7 @@ static int parse_channels(radio_priv_t* 
     return STREAM_OK;
 }
 
-#ifdef HAVE_RADIO_V4L2
+#ifdef CONFIG_RADIO_V4L2
 /*****************************************************************
  * \brief get fraction value for using in set_frequency and get_frequency
  * \return STREAM_OK if success, STREAM_ERROR otherwise
@@ -409,8 +409,8 @@ static const radio_driver_t radio_driver
     set_frequency_v4l2,
     get_frequency_v4l2
 };
-#endif //HAVE_RADIO_V4L2
-#ifdef HAVE_RADIO_V4L
+#endif /* CONFIG_RADIO_V4L2 */
+#ifdef CONFIG_RADIO_V4L
 /*****************************************************************
  * \brief get fraction value for using in set_frequency and get_frequency
  * \return STREAM_OK if success, STREAM_ERROR otherwise
@@ -540,8 +540,8 @@ static const radio_driver_t radio_driver
     set_frequency_v4l,
     get_frequency_v4l
 };
-#endif //HAVE_RADIO_V4L
-#ifdef HAVE_RADIO_BSDBT848
+#endif /* CONFIG_RADIO_V4L */
+#ifdef CONFIG_RADIO_BSDBT848
 
 /*****************************************************************
  * \brief get fraction value for using in set_frequency and get_frequency
@@ -652,7 +652,7 @@ static const radio_driver_t radio_driver
     set_frequency_bsdbt848,
     get_frequency_bsdbt848
 };
-#endif //HAVE_RADIO_BSDBT848
+#endif /* CONFIG_RADIO_BSDBT848 */
 
 static inline int init_frac(radio_priv_t* priv){ 
     return priv->driver->init_frac(priv);
@@ -1080,13 +1080,13 @@ static int fill_buffer_s(struct stream_s
  when no driver explicitly specified first available will be used
  */
 static const radio_driver_t* radio_drivers[]={
-#ifdef HAVE_RADIO_BSDBT848
+#ifdef CONFIG_RADIO_BSDBT848
     &radio_driver_bsdbt848,
 #endif
-#ifdef HAVE_RADIO_V4L2
+#ifdef CONFIG_RADIO_V4L2
     &radio_driver_v4l2,
 #endif
-#ifdef HAVE_RADIO_V4L
+#ifdef CONFIG_RADIO_V4L
     &radio_driver_v4l,
 #endif
     0

Modified: trunk/stream/stream_radio.h
==============================================================================
--- trunk/stream/stream_radio.h	(original)
+++ trunk/stream/stream_radio.h	Sun Aug  3 17:21:40 2008
@@ -9,7 +9,7 @@
 typedef struct radio_param_s{
     /** name of radio device file */
     char*   device;
-#ifdef HAVE_RADIO_BSDBT848
+#ifdef CONFIG_RADIO_BSDBT848
     /** minimal allowed frequency */
     float   freq_min;
     /** maximal allowed frequency */

Modified: trunk/stream/tv.c
==============================================================================
--- trunk/stream/tv.c	(original)
+++ trunk/stream/tv.c	Sun Aug  3 17:21:40 2008
@@ -49,16 +49,16 @@ extern const tvi_info_t tvi_info_bsdbt84
 
 /** List of drivers in autodetection order */
 static const tvi_info_t* tvi_driver_list[]={
-#ifdef HAVE_TV_V4L2
+#ifdef CONFIG_TV_V4L2
     &tvi_info_v4l2,
 #endif
-#ifdef HAVE_TV_V4L1
+#ifdef CONFIG_TV_V4L1
     &tvi_info_v4l,
 #endif
-#ifdef HAVE_TV_BSDBT848
+#ifdef CONFIG_TV_BSDBT848
     &tvi_info_bsdbt848,
 #endif
-#ifdef HAVE_TV_DSHOW
+#ifdef CONFIG_TV_DSHOW
     &tvi_info_dshow,
 #endif
     &tvi_info_dummy,
@@ -404,12 +404,12 @@ static int open_tv(tvi_handle_t *tvh)
     /* set some params got from cmdline */
     funcs->control(tvh->priv, TVI_CONTROL_SPC_SET_INPUT, &tvh->tv_param->input);
 
-#if defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW)
+#if defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW)
     if (0
-#ifdef HAVE_TV_V4L2
+#ifdef CONFIG_TV_V4L2
     || (!strcmp(tvh->tv_param->driver, "v4l2") && tvh->tv_param->normid >= 0)
 #endif
-#ifdef HAVE_TV_DSHOW
+#ifdef CONFIG_TV_DSHOW
     || (!strcmp(tvh->tv_param->driver, "dshow") && tvh->tv_param->normid >= 0)
 #endif
     )
@@ -418,7 +418,7 @@ static int open_tv(tvi_handle_t *tvh)
 #endif
     tv_set_norm(tvh,tvh->tv_param->norm);
 
-#ifdef HAVE_TV_V4L1
+#ifdef CONFIG_TV_V4L1
     if ( tvh->tv_param->mjpeg )
     {
       /* set width to expected value */

Modified: trunk/stream/tvi_dshow.c
==============================================================================
--- trunk/stream/tvi_dshow.c	(original)
+++ trunk/stream/tvi_dshow.c	Sun Aug  3 17:21:40 2008
@@ -2306,7 +2306,7 @@ static int get_audio_framesize(priv_t * 
     return priv->chains[1]->rbuf->blocksize;
 }
 
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 static int vbi_get_props(priv_t* priv,tt_stream_props* ptsp)
 {
     if(!priv || !ptsp)
@@ -2352,7 +2352,7 @@ static void vbi_grabber(priv_t* priv)
     }
     free(buf);
 }
-#endif //HAVE_TV_TELETEXT
+#endif /* CONFIG_TV_TELETEXT */
 
 /**
  * \brief fills given buffer with video data (usually one frame)
@@ -2397,7 +2397,7 @@ static double grab_video_frame(priv_t * 
       rb->count--;
     LeaveCriticalSection(rb->pMutex);
 
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
     vbi_grabber(priv);
 #endif
     return pts;
@@ -2588,7 +2588,7 @@ static HRESULT build_audio_chain(priv_t 
  */
 static HRESULT build_vbi_chain(priv_t *priv)
 {
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
     HRESULT hr;
 
     if(priv->chains[2]->rbuf)
@@ -2944,7 +2944,7 @@ static int init(priv_t * priv)
             OLE_QUERYINTERFACE(priv->pBuilder,IID_IBaseFilter,pBF);
             OLE_CALL_ARGS(pBF,SetSyncSource,rc);
         }
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
        if(vbi_get_props(priv,&(priv->tsp))!=TVI_CONTROL_TRUE)
            break;
 #endif
@@ -3017,7 +3017,7 @@ static int uninit(priv_t * priv)
     if (priv->dwRegister) {
         RemoveFromRot(priv->dwRegister);
     }
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
     teletext_control(priv->priv_vbi,TV_VBI_CONTROL_STOP,(void*)1);
 #endif
     //stop audio grabber thread
@@ -3524,7 +3524,7 @@ static int control(priv_t * priv, int cm
     case TVI_CONTROL_IMMEDIATE:
 	priv->immediate_mode = 1;
 	return TVI_CONTROL_TRUE;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
     case TVI_CONTROL_VBI_INIT:
     {
         void* ptr;

Modified: trunk/stream/tvi_v4l.c
==============================================================================
--- trunk/stream/tvi_v4l.c	(original)
+++ trunk/stream/tvi_v4l.c	Sun Aug  3 17:21:40 2008
@@ -141,7 +141,7 @@ typedef struct {
     long                        audio_recv_blocks_total;
     long                        audio_sent_blocks_total;
     long                        mjpeg_bufsize;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
     char                        *vbi_dev;
     int                         vbi_fd;
     int                         vbi_bufsize;
@@ -675,7 +675,7 @@ static int uninit(priv_t *priv)
 {
     unsigned long num;
 
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
     priv->vbi_shutdown=1;
     if(priv->vbi_grabber_thread)
         pthread_join(priv->vbi_grabber_thread, NULL);
@@ -781,7 +781,7 @@ static int get_capture_buffer_size(priv_
     return cnt;
 }
 
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 static int vbi_init(priv_t* priv,char* device)
 {
     int vbi_fd=0;
@@ -897,7 +897,7 @@ static void *vbi_grabber(void *data)
     free(buf);
     return NULL;
 }
-#endif //HAVE_TV_TELETEXT
+#endif /* CONFIG_TV_TELETEXT */
 
 static int start(priv_t *priv)
 {
@@ -1111,7 +1111,7 @@ static int start(priv_t *priv)
         ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id]);
     }
 
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
     /* start vbi thread */
     if(priv->priv_vbi){
         priv->vbi_shutdown = 0;
@@ -1511,7 +1511,7 @@ static int control(priv_t *priv, int cmd
             priv->immediate_mode = 1;
             return TVI_CONTROL_TRUE;
         }
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
         case TVI_CONTROL_VBI_INIT:
         {
             void* ptr;

Modified: trunk/stream/tvi_v4l2.c
==============================================================================
--- trunk/stream/tvi_v4l2.c	(original)
+++ trunk/stream/tvi_v4l2.c	Sun Aug  3 17:21:40 2008
@@ -77,7 +77,7 @@ typedef struct {
     /* video */
     char                        *video_dev;
     int                         video_fd;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
     char                        *vbi_dev;
     int                         vbi_fd;
     int                         vbi_bufsize;
@@ -580,7 +580,7 @@ static int get_control(priv_t *priv, str
     return TVI_CONTROL_TRUE;
 }
 
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 static int vbi_init(priv_t* priv,char* device)
 {
     int vbi_fd=0;
@@ -703,7 +703,7 @@ static void *vbi_grabber(void *data)
     free(buf);
     return NULL;
 }
-#endif //HAVE_TV_TELETEXT
+#endif /* CONFIG_TV_TELETEXT */
 
 static int control(priv_t *priv, int cmd, void *arg)
 {
@@ -1019,7 +1019,7 @@ static int control(priv_t *priv, int cmd
         if (audio_in_set_samplerate(&priv->audio_in, *(int*)arg) < 0) return TVI_CONTROL_FALSE;
 //        setup_audio_buffer_sizes(priv);
         return TVI_CONTROL_TRUE;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
     case TVI_CONTROL_VBI_INIT:
     {
         void* ptr;
@@ -1086,7 +1086,7 @@ static int uninit(priv_t *priv)
 {
     int i, frames, dropped = 0;
 
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
     priv->vbi_shutdown=1;
     if(priv->vbi_grabber_thread)
         pthread_join(priv->vbi_grabber_thread, NULL);
@@ -1540,7 +1540,7 @@ static int start(priv_t *priv)
         }
     }
 
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
     /* start vbi thread */
     if(priv->priv_vbi){
         priv->vbi_shutdown = 0;

