summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/en/mplayer.112
-rw-r--r--DOCS/man/fr/mplayer.12
-rw-r--r--Makefile8
-rw-r--r--TOOLS/README6
-rwxr-xr-xTOOLS/binary_codecs.sh (renamed from TOOLS/install-w32codecs.sh)0
-rw-r--r--TOOLS/fastmemcpybench.c4
-rw-r--r--cfg-common-opts.h10
-rw-r--r--cfg-mencoder.h48
-rw-r--r--cfg-mplayer.h18
-rw-r--r--codec-cfg.c2
-rw-r--r--command.c12
-rwxr-xr-xconfigure205
-rw-r--r--etc/codecs.conf12
-rw-r--r--gui/cfg.c2
-rw-r--r--gui/interface.c4
-rw-r--r--gui/mplayer/gtk/about.c8
-rw-r--r--gui/mplayer/gtk/opts.c20
-rw-r--r--gui/mplayer/widgets.c2
-rw-r--r--help/help_mp-bg.h2
-rw-r--r--help/help_mp-cs.h2
-rw-r--r--help/help_mp-dk.h2
-rw-r--r--help/help_mp-el.h2
-rw-r--r--help/help_mp-es.h2
-rw-r--r--help/help_mp-fr.h2
-rw-r--r--help/help_mp-it.h2
-rw-r--r--help/help_mp-ja.h2
-rw-r--r--help/help_mp-ko.h2
-rw-r--r--help/help_mp-mk.h2
-rw-r--r--help/help_mp-nb.h2
-rw-r--r--help/help_mp-nl.h2
-rw-r--r--help/help_mp-pl.h2
-rw-r--r--help/help_mp-pt_BR.h2
-rw-r--r--help/help_mp-ro.h2
-rw-r--r--help/help_mp-ru.h2
-rw-r--r--help/help_mp-sk.h2
-rw-r--r--help/help_mp-sv.h2
-rw-r--r--help/help_mp-tr.h2
-rw-r--r--help/help_mp-uk.h2
-rw-r--r--help/help_mp-zh_TW.h2
-rw-r--r--input/input.c8
-rw-r--r--libass/ass.c10
-rw-r--r--libass/ass_mp.c2
-rw-r--r--libmenu/menu.c6
-rw-r--r--libmpcodecs/ad.c10
-rw-r--r--libmpcodecs/ae.c16
-rw-r--r--libmpcodecs/ae_lame.c10
-rw-r--r--libmpcodecs/vd.c6
-rw-r--r--libmpcodecs/ve.c6
-rw-r--r--libmpcodecs/ve_raw.c3
-rw-r--r--libmpdemux/demux_avi.c2
-rw-r--r--libmpdemux/demux_ogg.c18
-rw-r--r--libmpdemux/demuxer.c6
-rw-r--r--libmpdemux/demuxer.h2
-rw-r--r--libmpeg2/libmpeg-0.4.1.diff21
-rw-r--r--libmpeg2/motion_comp.c5
-rw-r--r--libvo/font_load_ft.c6
-rw-r--r--libvo/mga_common.c2
-rw-r--r--libvo/video_out.c46
-rw-r--r--libvo/video_out.h4
-rw-r--r--libvo/vo_directx.c4
-rw-r--r--libvo/vo_dxr3.c12
-rw-r--r--libvo/vo_ggi.c14
-rw-r--r--libvo/vo_gl.c4
-rw-r--r--libvo/vo_gl2.c6
-rw-r--r--libvo/vo_x11.c4
-rw-r--r--libvo/vo_xmga.c4
-rw-r--r--libvo/vo_xover.c6
-rw-r--r--libvo/vo_xv.c4
-rw-r--r--libvo/vo_xvidix.c6
-rw-r--r--libvo/vo_xvmc.c4
-rw-r--r--libvo/x11_common.c14
-rw-r--r--loader/win32.c4
-rw-r--r--mp_msg.c16
-rw-r--r--mpcommon.c12
-rw-r--r--mplayer.c66
-rw-r--r--osdep/getch2-os2.c6
-rw-r--r--osdep/getch2-win.c2
-rw-r--r--osdep/getch2.c10
-rw-r--r--stream/asf_mmst_streaming.c18
-rw-r--r--stream/cache2.c2
-rw-r--r--stream/librtsp/rtsp_rtp.c4
-rw-r--r--stream/tcp.c4
-rw-r--r--stream/udp.c4
-rw-r--r--subreader.c24
84 files changed, 425 insertions, 435 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index ec17c3f873..888f3454b4 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -8196,24 +8196,14 @@ the quantizer more over time (slower change).
.TP
.B vqcomp=<0.0\-1.0>
Quantizer compression, vrc_eq depends upon this (default: 0.5).
-For instance, assuming the default rate control equation is used,
-if vqcomp=1.0, the ratecontrol allocates to each frame the number of bits
-needed to encode them all at the same QP.
-If vqcomp=0.0, the ratecontrol allocates the same number of bits to each
-frame, i.e. strict CBR.
.I NOTE:
-Those are extreme settings and should never be used.
-Perceptual quality will be optimal somewhere in between these two extremes.
+Perceptual quality will be optimal somewhere in between the range's extremes.
.
.TP
.B vrc_eq=<equation>
main ratecontrol equation
.RE
.RSs
-.IPs "1\ \ \ \ "
-constant bitrate
-.IPs "tex\ \ "
-constant quality
.IPs 1+(tex/\:avgTex-1)*qComp
approximately the equation of the old ratecontrol code
.IPs tex^qComp
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index 9479e66411..2b1ebc814f 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -1,4 +1,4 @@
-.\" synced with r27337
+.\" synced with r27236
.\" Encoding: iso-8859-1
.\" MPlayer (C) 2000-2008 MPlayer Team
.\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
diff --git a/Makefile b/Makefile
index 318ebec703..59b4838e68 100644
--- a/Makefile
+++ b/Makefile
@@ -961,10 +961,10 @@ fastmemcpybench: TOOLS/fastmemcpybench.c
$(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_3DNOW
$(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
$(CC) $(CFLAGS) $< -o TOOLS/fastmem-sse$(EXESUF) -DNAME=\"sse\" -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2
- $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-mmx$(EXESUF) -DNAME=\"mga-mmx\" -DHAVE_MGA -DHAVE_MMX
- $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k6$(EXESUF) -DNAME=\"mga-k6\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW
- $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k7$(EXESUF) -DNAME=\"mga-k7\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
- $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-sse$(EXESUF) -DNAME=\"mga-sse\" -DHAVE_MGA -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2
+ $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-mmx$(EXESUF) -DNAME=\"mga-mmx\" -DCONFIG_MGA -DHAVE_MMX
+ $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k6$(EXESUF) -DNAME=\"mga-k6\ \" -DCONFIG_MGA -DHAVE_MMX -DHAVE_3DNOW
+ $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k7$(EXESUF) -DNAME=\"mga-k7\ \" -DCONFIG_MGA -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
+ $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-sse$(EXESUF) -DNAME=\"mga-sse\" -DCONFIG_MGA -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2
REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c)
REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0)
diff --git a/TOOLS/README b/TOOLS/README
index 7acf57daef..7aa32bd150 100644
--- a/TOOLS/README
+++ b/TOOLS/README
@@ -429,15 +429,15 @@ Note: You will need the libwww-perl stuff and the cabextract utility
which can be found at http://www.kyz.uklinux.net/cabextract.php3.
-install-w32codecs.sh
+binary_codecs.sh
Author: Andrea Menucci, thuglife
Description: Downloads binary codecs from mplayerhq.hu and installs them
on a Debian system.
-Usage: install-w32codecs.sh install
- install-w32codecs.sh uninstall
+Usage: binary_codecs.sh install
+ binary_codecs.sh uninstall
vobshift.py
diff --git a/TOOLS/install-w32codecs.sh b/TOOLS/binary_codecs.sh
index c4ab61cf4b..c4ab61cf4b 100755
--- a/TOOLS/install-w32codecs.sh
+++ b/TOOLS/binary_codecs.sh
diff --git a/TOOLS/fastmemcpybench.c b/TOOLS/fastmemcpybench.c
index 9a2e34a850..1e3cc14ce3 100644
--- a/TOOLS/fastmemcpybench.c
+++ b/TOOLS/fastmemcpybench.c
@@ -20,7 +20,7 @@
//#define ARR_SIZE 100000
#define ARR_SIZE (1024*768*2)
-#ifdef HAVE_MGA
+#ifdef CONFIG_MGA
#include "drivers/mga_vid.h"
@@ -98,7 +98,7 @@ int main( void )
unsigned char * marr1,*marr2;
int i;
unsigned int t;
-#ifdef HAVE_MGA
+#ifdef CONFIG_MGA
mga_init();
marr1 = &frame[3];
#else
diff --git a/cfg-common-opts.h b/cfg-common-opts.h
index 02b97ca770..bed907c14e 100644
--- a/cfg-common-opts.h
+++ b/cfg-common-opts.h
@@ -6,7 +6,7 @@
{"msglevel", (void *) msgl_config, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
{"msgcolor", &mp_msg_color, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"msgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
{"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
#endif
#ifdef WIN32
@@ -251,14 +251,14 @@
#ifdef CONFIG_LIBAVFORMAT
{"lavfdopts", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
#endif
-#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
+#ifdef CONFIG_XVID4
{"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#endif
{"codecs-file", &codecs_file, CONF_TYPE_STRING, 0, 0, 0, NULL},
// ------------------------- subtitles options --------------------
{"sub", &sub_name, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
-#ifdef CONFIG_FRIBIDI
+#ifdef HAVE_FRIBIDI
{"fribidi-charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"flip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noflip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL},
@@ -270,8 +270,8 @@
{"noflip-hebrew", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{"flip-hebrew-commas", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{"noflip-hebrew-commas", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* CONFIG_FRIBIDI */
-#ifdef CONFIG_ICONV
+#endif /* HAVE_FRIBIDI */
+#ifdef HAVE_ICONV
{"subcp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL},
#endif
{"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL},
diff --git a/cfg-mencoder.h b/cfg-mencoder.h
index 5338a6f91f..2afd25945a 100644
--- a/cfg-mencoder.h
+++ b/cfg-mencoder.h
@@ -52,13 +52,13 @@ const m_option_t ovc_conf[]={
" vfw - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n"
" qtvideo - QuickTime DLLs, currently only SVQ1/3 are supported.\n"
#endif
-#ifdef HAVE_LIBDV095
+#ifdef CONFIG_LIBDV095
" libdv - DV encoding with libdv v0.9.5\n"
#endif
-#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
+#ifdef CONFIG_XVID4
" xvid - XviD encoding\n"
#endif
-#ifdef HAVE_X264
+#ifdef CONFIG_X264
" x264 - H.264 encoding\n"
#endif
"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
@@ -68,47 +68,47 @@ const m_option_t ovc_conf[]={
const m_option_t oac_conf[]={
{"copy", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_COPY, NULL},
{"pcm", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_PCM, NULL},
-#ifdef HAVE_MP3LAME
+#ifdef CONFIG_MP3LAME
{"mp3lame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_VBRMP3, NULL},
#else
{"mp3lame", "MPlayer was compiled without libmp3lame support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_MP3LAME */
+#endif /* CONFIG_MP3LAME */
#ifdef CONFIG_LIBAVCODEC
{"lavc", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_LAVC, NULL},
#else
{"lavc", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif /* CONFIG_LIBAVCODEC */
-#ifdef HAVE_TOOLAME
+#ifdef CONFIG_TOOLAME
{"toolame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_TOOLAME, NULL},
#else
{"toolame", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_TOOLAME */
-#ifdef HAVE_TWOLAME
+#endif /* CONFIG_TOOLAME */
+#ifdef CONFIG_TWOLAME
{"twolame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_TWOLAME, NULL},
#else
{"twolame", "MPlayer was compiled without libtwolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_TWOLAME */
-#ifdef HAVE_FAAC
+#endif /* CONFIG_TWOLAME */
+#ifdef CONFIG_FAAC
{"faac", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_FAAC, NULL},
#else
{"faac", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_FAAC */
+#endif /* CONFIG_FAAC */
{"help", "\nAvailable codecs:\n"
" copy - frame copy, without re-encoding (useful for AC3)\n"
" pcm - uncompressed PCM audio\n"
-#ifdef HAVE_MP3LAME
+#ifdef CONFIG_MP3LAME
" mp3lame - cbr/abr/vbr MP3 using libmp3lame\n"
#endif
#ifdef CONFIG_LIBAVCODEC
" lavc - FFmpeg audio encoder (MP2, AC3, ...)\n"
#endif
-#ifdef HAVE_TOOLAME
+#ifdef CONFIG_TOOLAME
" toolame - Toolame MP2 audio encoder\n"
#endif
-#ifdef HAVE_TWOLAME
+#ifdef CONFIG_TWOLAME
" twolame - Twolame MP2 audio encoder\n"
#endif
-#ifdef HAVE_FAAC
+#ifdef CONFIG_FAAC
" faac - FAAC AAC audio encoder\n"
#endif
"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
@@ -217,7 +217,7 @@ const m_option_t mencoder_opts[]={
// info header strings
{"info", (void *) info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
-#ifdef HAVE_MP3LAME
+#ifdef CONFIG_MP3LAME
{"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
#endif
#ifdef CONFIG_LIBAVCODEC
@@ -225,28 +225,28 @@ const m_option_t mencoder_opts[]={
#else
{"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif /* CONFIG_LIBAVCODEC */
-#ifdef HAVE_TOOLAME
+#ifdef CONFIG_TOOLAME
{"toolameopts", toolameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
#else
{"toolameopts", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_TOOLAME */
-#ifdef HAVE_TWOLAME
+#endif /* CONFIG_TOOLAME */
+#ifdef CONFIG_TWOLAME
{"twolameopts", twolameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
#else
{"twolameopts", "MPlayer was compiled without libtwolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_TWOLAME */
-#ifdef HAVE_FAAC
+#endif /* CONFIG_TWOLAME */
+#ifdef CONFIG_FAAC
{"faacopts", faacopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
#else
{"faacopts", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* HAVE_FAAC */
+#endif /* CONFIG_FAAC */
#ifdef CONFIG_WIN32DLL
{"xvfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
#endif
-#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
+#ifdef CONFIG_XVID4
{"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
#endif
-#if defined(HAVE_X264)
+#if defined(CONFIG_X264)
{"x264encopts", &x264enc_set_param, CONF_TYPE_FUNC_PARAM, CONF_GLOBAL, 0, 0, NULL},
#endif
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index a4350eefee..b3a4fd0451 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -135,17 +135,17 @@ const m_option_t mplayer_opts[]={
{"sdla", "Use -ao sdl:driver instead of -ao sdl -sdla driver.\n",
CONF_TYPE_PRINT, 0, 0, 0, NULL},
-#if defined(HAVE_FBDEV)||defined(HAVE_VESA)
+#if defined(CONFIG_FBDEV) || defined(CONFIG_VESA)
{"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"monitor-vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"monitor-dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
#endif
-#ifdef HAVE_FBDEV
+#ifdef CONFIG_FBDEV
{"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0, NULL},
#endif
-#ifdef HAVE_DIRECTFB
+#ifdef CONFIG_DIRECTFB
#if DIRECTFBVERSION > 912
{"dfbopts", "-dfbopts has been removed. Use -vf directfb:dfbopts=... instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
#endif
@@ -216,7 +216,7 @@ const m_option_t mplayer_opts[]={
{"vaa_dr", "-vaa_dr has been removed, use -dr.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
{"vaa_nodr", "-vaa_nodr has been removed, use -nodr.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-#ifdef HAVE_AA
+#ifdef CONFIG_AA
// -vo aa
{"aa*", "-aa* has been removed. Use -vo aa:suboption instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
#endif
@@ -241,7 +241,7 @@ const m_option_t mplayer_opts[]={
#endif
{"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
{"osd-duration", &osd_duration, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
-#ifdef HAVE_MENU
+#ifdef CONFIG_MENU
{"menu", &use_menu, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"nomenu", &use_menu, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
{"menu-root", &menu_root, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
@@ -249,16 +249,16 @@ const m_option_t mplayer_opts[]={
{"menu-startup", &menu_startup, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"menu-keepdir", &menu_keepdir, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"menu-chroot", &menu_chroot, CONF_TYPE_STRING, 0, 0, 0, NULL},
-#ifdef CONFIG_FRIBIDI
+#ifdef HAVE_FRIBIDI
{"menu-fribidi-charset", &menu_fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"menu-flip-hebrew", &menu_flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"menu-noflip-hebrew", &menu_flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"menu-flip-hebrew-commas", &menu_fribidi_flip_commas, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"menu-noflip-hebrew-commas", &menu_fribidi_flip_commas, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-#endif /* CONFIG_FRIBIDI */
+#endif /* HAVE_FRIBIDI */
#else
{"menu", "OSD menu support was not compiled in.\n", CONF_TYPE_PRINT,0, 0, 0, NULL},
-#endif /* HAVE_MENU */
+#endif /* CONFIG_MENU */
// these should be moved to -common, and supported in MEncoder
{"vobsub", &vobsub_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
@@ -297,7 +297,7 @@ const m_option_t mplayer_opts[]={
{"gui", "The -gui option will only work as the first command line argument.\n", CONF_TYPE_PRINT, 0, 0, 0, (void *)1},
{"nogui", "The -nogui option will only work as the first command line argument.\n", CONF_TYPE_PRINT, 0, 0, 0, (void *)1},
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
{"skin", &skinName, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
{"enqueue", &enqueue, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noenqueue", &enqueue, CONF_TYPE_FLAG, 0, 1, 0, NULL},
diff --git a/codec-cfg.c b/codec-cfg.c
index e293fb85dc..221c88dd18 100644
--- a/codec-cfg.c
+++ b/codec-cfg.c
@@ -883,7 +883,7 @@ void list_codecs(int audioflag){
/*
* Fake out GUI references when building the codecs2html utility.
*/
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
void gtkMessageBox( int type,char * str ) { return; }
int use_gui = 0;
#endif
diff --git a/command.c b/command.c
index 78564d6755..093aa4fb7b 100644
--- a/command.c
+++ b/command.c
@@ -51,11 +51,11 @@
#include "libass/ass.h"
#include "libass/ass_mp.h"
#endif
-#ifdef HAVE_MENU
+#ifdef CONFIG_MENU
#include "m_struct.h"
#include "libmenu/menu.h"
#endif
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
@@ -977,7 +977,7 @@ static int mp_property_fullscreen(m_option_t *prop, int action, void *arg,
return M_PROPERTY_OK;
case M_PROPERTY_STEP_UP:
case M_PROPERTY_STEP_DOWN:
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (use_gui)
guiGetEvent(guiIEvent, (char *) MP_CMD_GUI_FULLSCREEN);
else
@@ -2492,7 +2492,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
int n = cmd->args[0].v.i == 0 ? 1 : cmd->args[0].v.i;
int force = cmd->args[1].v.i;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (use_gui) {
int i = 0;
if (n > 0)
@@ -3132,7 +3132,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
"Selected button number %d", button);
}
#endif
-#ifdef HAVE_MENU
+#ifdef CONFIG_MENU
if (use_menu && dx >= 0.0 && dy >= 0.0)
menu_update_mouse_pos(dx, dy);
#endif
@@ -3168,7 +3168,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
#endif
default:
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if ((use_gui) && (cmd->id > MP_CMD_GUI_EVENTS))
guiGetEvent(guiIEvent, (char *) cmd->id);
else
diff