summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cfg-mplayer.h2
-rw-r--r--codec-cfg.c2
-rw-r--r--command.c8
-rwxr-xr-xconfigure18
-rw-r--r--gui/mplayer/gtk/about.c8
-rw-r--r--gui/mplayer/gtk/opts.c2
-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.c6
-rw-r--r--libvo/mga_common.c2
-rw-r--r--libvo/vo_directx.c4
-rw-r--r--libvo/vo_dxr3.c12
-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.c16
-rw-r--r--mp_msg.c6
-rw-r--r--mpcommon.c12
-rw-r--r--mplayer.c50
-rw-r--r--stream/cache2.c2
45 files changed, 116 insertions, 116 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index b6ab021ea7..246c8892d9 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -307,7 +307,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 61de8e68dc..2aba3dd474 100644
--- a/command.c
+++ b/command.c
@@ -54,7 +54,7 @@
#include "m_struct.h"
#include "libmenu/menu.h"
#endif
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
@@ -970,7 +970,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
@@ -2484,7 +2484,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)
@@ -3160,7 +3160,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 --git a/configure b/configure
index bacca08721..f24e58c361 100755
--- a/configure
+++ b/configure
@@ -7410,8 +7410,8 @@ if test "$_gtk1" = no ; then
_libs_mplayer="$_libs_mplayer `$_pkg_config glib-2.0 --libs 2>/dev/null`"
echores "$_glib"
- _def_gui='#define HAVE_NEW_GUI 1'
- _def_gtk2_gui='#define HAVE_GTK2_GUI 1'
+ _def_gui='#define CONFIG_GUI 1'
+ _def_gtk2='#define CONFIG_GTK2 1'
else
_gtk1=yes
echo "GLIB-2 devel packages were not found, trying GTK 1.2"
@@ -7454,20 +7454,20 @@ if test "$_gtk1" = yes ; then
_libs_mplayer="$_libs_mplayer `$_glibconfig --libs 2>&1`"
echores "$_glib (using $_glibconfig)"
- _def_gui='#define HAVE_NEW_GUI 1'
- _def_gtk2_gui='#undef HAVE_GTK2_GUI'
+ _def_gui='#define CONFIG_GUI 1'
+ _def_gtk2='#undef CONFIG_GTK2'
fi
else #if ! win32
_gui_win32=yes
_libs_mplayer="$_libs_mplayer -lcomdlg32 -lcomctl32 -lshell32 -lkernel32"
- _def_gui='#define HAVE_NEW_GUI 1'
- _def_gtk2_gui='#undef HAVE_GTK2_GUI'
+ _def_gui='#define CONFIG_GUI 1'
+ _def_gtk2='#undef CONFIG_GTK2'
fi #if ! win32
else #if test "$_gui"
- _def_gui='#undef HAVE_NEW_GUI'
- _def_gtk2_gui='#undef HAVE_GTK2_GUI'
+ _def_gui='#undef CONFIG_GUI'
+ _def_gtk2='#undef CONFIG_GTK2'
fi #if test "$_gui"
# --------------- GUI specific tests end -------------------
@@ -8345,7 +8345,7 @@ $_def_unrar_exec
/* gui support, please do not edit this option */
$_def_gui
-$_def_gtk2_gui
+$_def_gtk2
/* Audio output drivers */
$_def_ossaudio
diff --git a/gui/mplayer/gtk/about.c b/gui/mplayer/gtk/about.c
index ccb04ff8ad..d14d449e5f 100644
--- a/gui/mplayer/gtk/about.c
+++ b/gui/mplayer/gtk/about.c
@@ -45,10 +45,10 @@ GtkWidget * create_About( void )
GtkWidget * AboutText;
GtkWidget * Ok;
-#ifdef HAVE_GTK2_GUI
+#ifdef CONFIG_GTK2
GtkTextBuffer * AboutTextBuffer;
GtkTextIter iter;
-#endif //HAVE_GTK2_GUI
+#endif /* CONFIG_GTK2 */
GtkStyle * pixmapstyle;
GdkPixmap * pixmapwid;
@@ -89,7 +89,7 @@ GtkWidget * create_About( void )
gtk_box_pack_start( GTK_BOX( vbox ),scrolledwindow1,TRUE,TRUE,0 );
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC );
-#ifdef HAVE_GTK2_GUI
+#ifdef CONFIG_GTK2
AboutText = gtk_text_view_new();
gtk_text_view_set_editable(GTK_TEXT_VIEW(AboutText), FALSE);
gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(AboutText), FALSE);
@@ -102,7 +102,7 @@ GtkWidget * create_About( void )
gtk_widget_set_name( AboutText,"AboutText" );
gtk_widget_show( AboutText );
gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText );
-#ifdef HAVE_GTK2_GUI
+#ifdef CONFIG_GTK2
gtk_text_buffer_insert (AboutTextBuffer, &iter,
#else
gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
index feb189171b..8e78dcb53d 100644
--- a/gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
@@ -782,7 +782,7 @@ static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,g
!strncmp( ao_driver[0],"esd",3 ) ||
!strncmp( ao_driver[0],"sdl",3 ) )
gtk_widget_set_sensitive( AConfig,TRUE );
-#ifndef HAVE_GTK2_GUI
+#ifndef CONFIG_GTK2
if ( !strncmp( ao_driver[0],"arts",4 ) )
gtkMessageBox(GTK_MB_WARNING|GTK_MB_SIMPLE, MSGTR_PREFERENCES_ArtsBroken);
#endif
diff --git a/gui/mplayer/widgets.c b/gui/mplayer/widgets.c
index bf3dd61989..0cf3c1fbd9 100644
--- a/gui/mplayer/widgets.c
+++ b/gui/mplayer/widgets.c
@@ -76,7 +76,7 @@ Pixmap guiIconMask;
void gtkInit( void )
{
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[widget] init GTK ...\n" );
-#ifdef HAVE_GTK2_GUI
+#ifdef CONFIG_GTK2
gtk_disable_setlocale();
#endif
gtk_init( 0,NULL );
diff --git a/help/help_mp-bg.h b/help/help_mp-bg.h
index 5cadb0b45e..47e393b1be 100644
--- a/help/help_mp-bg.h
+++ b/help/help_mp-bg.h
@@ -565,7 +565,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "Информация"
diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h
index c6772f6a49..635173d71a 100644
--- a/help/help_mp-cs.h
+++ b/help/help_mp-cs.h
@@ -705,7 +705,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "O aplikaci"
diff --git a/help/help_mp-dk.h b/help/help_mp-dk.h
index fae973d53c..a3b5472153 100644
--- a/help/help_mp-dk.h
+++ b/help/help_mp-dk.h
@@ -332,7 +332,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "Om"
diff --git a/help/help_mp-el.h b/help/help_mp-el.h
index b3f05b8a20..e7a3a3fcb2 100644
--- a/help/help_mp-el.h
+++ b/help/help_mp-el.h
@@ -342,7 +342,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "Περί"
diff --git a/help/help_mp-es.h b/help/help_mp-es.h
index d4cb70fd81..f0303fa3a5 100644
--- a/help/help_mp-es.h
+++ b/help/help_mp-es.h
@@ -711,7 +711,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "Acerca de"
diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h
index fd0369bf18..7389a82b7d 100644
--- a/help/help_mp-fr.h
+++ b/help/help_mp-fr.h
@@ -709,7 +709,7 @@ static char help_text[]=
// ====================== messages/boutons GUI ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "À propos..."
diff --git a/help/help_mp-it.h b/help/help_mp-it.h
index dda7a009b8..9bdd4195f2 100644
--- a/help/help_mp-it.h
+++ b/help/help_mp-it.h
@@ -717,7 +717,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "Informazioni su"
diff --git a/help/help_mp-ja.h b/help/help_mp-ja.h
index 7c9cfd3aee..f7355685a3 100644
--- a/help/help_mp-ja.h
+++ b/help/help_mp-ja.h
@@ -273,7 +273,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "アバウト"
diff --git a/help/help_mp-ko.h b/help/help_mp-ko.h
index 878c985f68..0fb904e0a8 100644
--- a/help/help_mp-ko.h
+++ b/help/help_mp-ko.h
@@ -336,7 +336,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "정보"
diff --git a/help/help_mp-mk.h b/help/help_mp-mk.h
index 7913d64090..8d590ec552 100644
--- a/help/help_mp-mk.h
+++ b/help/help_mp-mk.h
@@ -333,7 +333,7 @@ static char help_text[]=
// ====================== GUI пораки/копчиња ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- лабели ---
#define MSGTR_About "За"
diff --git a/help/help_mp-nb.h b/help/help_mp-nb.h
index 0c9d866865..9e6c860c12 100644
--- a/help/help_mp-nb.h
+++ b/help/help_mp-nb.h
@@ -164,7 +164,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "Om"
diff --git a/help/help_mp-nl.h b/help/help_mp-nl.h
index 7c40863786..003b0fb65e 100644
--- a/help/help_mp-nl.h
+++ b/help/help_mp-nl.h
@@ -550,7 +550,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "Info over"
diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h
index 16938f2789..2c1f9ef2b3 100644
--- a/help/help_mp-pl.h
+++ b/help/help_mp-pl.h
@@ -673,7 +673,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "O programie"
diff --git a/help/help_mp-pt_BR.h b/help/help_mp-pt_BR.h
index a133e6cd69..9d3481c16a 100644
--- a/help/help_mp-pt_BR.h
+++ b/help/help_mp-pt_BR.h
@@ -337,7 +337,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "Sobre"
diff --git a/help/help_mp-ro.h b/help/help_mp-ro.h
index 1912c0525b..61641ebf9e 100644
--- a/help/help_mp-ro.h
+++ b/help/help_mp-ro.h
@@ -291,7 +291,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "Despre MPlayer"
diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h
index c91dd9294e..ff6f6f960f 100644
--- a/help/help_mp-ru.h
+++ b/help/help_mp-ru.h
@@ -715,7 +715,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "О себе"
diff --git a/help/help_mp-sk.h b/help/help_mp-sk.h
index 46e9f4be0c..64b0bd8e81 100644
--- a/help/help_mp-sk.h
+++ b/help/help_mp-sk.h
@@ -656,7 +656,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "O aplikácii"
diff --git a/help/help_mp-sv.h b/help/help_mp-sv.h
index 8ea80bacae..94d1f192c2 100644
--- a/help/help_mp-sv.h
+++ b/help/help_mp-sv.h
@@ -563,7 +563,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "Om"
diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h
index 9bf05d4ef8..22a58bcd66 100644
--- a/help/help_mp-tr.h
+++ b/help/help_mp-tr.h
@@ -719,7 +719,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "Hakkında"
diff --git a/help/help_mp-uk.h b/help/help_mp-uk.h
index 837668806a..9481918d12 100644
--- a/help/help_mp-uk.h
+++ b/help/help_mp-uk.h
@@ -323,7 +323,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "Про програму"
diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h
index 59fabaa60b..a1050cf5fa 100644
--- a/help/help_mp-zh_TW.h
+++ b/help/help_mp-zh_TW.h
@@ -692,7 +692,7 @@ static char help_text[]=
// ====================== GUI messages/buttons ========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
// --- labels ---
#define MSGTR_About "關于"
diff --git a/input/input.c b/input/input.c
index 75e355b851..2e26c2b7b0 100644
--- a/input/input.c
+++ b/input/input.c
@@ -159,7 +159,7 @@ static const mp_cmd_t mp_cmds[] = {
{ MP_CMD_TV_TELETEXT_GO_LINK, "teletext_go_link", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
#endif
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
{ MP_CMD_GUI_LOADFILE, "gui_loadfile", 0, { {-1,{0}} } },
{ MP_CMD_GUI_LOADSUBTITLE, "gui_loadsubtitle", 0, { {-1,{0}} } },
{ MP_CMD_GUI_ABOUT, "gui_about", 0, { {-1,{0}} } },
@@ -480,7 +480,7 @@ static const mp_cmd_bind_t def_cmd_binds[] = {
};
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
static const mp_cmd_bind_t gui_def_cmd_binds[] = {
{ { 'l', 0 }, "gui_loadfile" },
@@ -1705,7 +1705,7 @@ void
mp_input_init(int use_gui) {
char* file;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if(use_gui)
mp_input_add_binds(gui_def_cmd_binds);
#endif
diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index 0ffaafc9e8..5d45434a30 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -317,7 +317,7 @@ static int control(uint32_t request, void *data, ...)
return VO_TRUE;
#endif
-#if defined( VO_XMGA ) && defined( HAVE_NEW_GUI )
+#if defined(VO_XMGA) && defined(CONFIG_GUI)
case VOCTRL_GUISUPPORT:
return VO_TRUE;
#endif
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index 87c9d5a645..b87c811b76 100644
--- a/libvo/vo_directx.c
+++ b/libvo/vo_directx.c
@@ -38,7 +38,7 @@
#include "geometry.h"
#include "mp_fifo.h"
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
@@ -1294,7 +1294,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
if(format != primary_image_format)nooverlay = 0;
window_aspect= (float)d_image_width / (float)d_image_height;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if(use_gui){
guiGetEvent(guiSetShVideo, 0);
}
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index 288a7a7e20..f2b3fd2a2d 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -32,7 +32,7 @@
#include "aspect.h"
#include "spuenc.h"
#include "sub.h"
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
#ifdef HAVE_X11
@@ -487,7 +487,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
vo_dy = (vo_screenheight - d_height) / 2;
vo_dwidth = d_width;
vo_dheight = d_height;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (use_gui) {
guiGetEvent(guiSetShVideo, 0);
XSetWindowBackground(mDisplay, vo_window, KEY_COLOR);
@@ -704,12 +704,12 @@ static void uninit(void)
overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF);
overlay_release(overlay_data);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (!use_gui) {
#endif
vo_x11_uninit();
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
}
#endif
}
@@ -886,14 +886,14 @@ static int preinit(const char *arg)
/* Initialize overlay and X11 */
overlay_data = overlay_init(fd_control);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (!use_gui) {
#endif
if (!vo_init()) {
mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToInitX11);
return -1;
}
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
}
#endif
}
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index dfe52707b3..f52d7b60d3 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -13,7 +13,7 @@
#include "gl_common.h"
#include "aspect.h"
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
#include "fastmemcpy.h"
@@ -459,7 +459,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
int_pause = 0;
vo_flipped = !!(flags & VOFLAG_FLIPPING);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (use_gui) {
// GUI creates and manages window for us
guiGetEvent(guiSetShVideo, 0);
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index 89af47751f..5a81213b6f 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -17,7 +17,7 @@
#include "gl_common.h"
#include "aspect.h"
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
@@ -542,7 +542,7 @@ static int config_glx(uint32_t width, uint32_t height, uint32_t d_width, uint32_
}
#endif
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
static int config_glx_gui(uint32_t d_width, uint32_t d_height) {
guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window
return 0;
@@ -616,7 +616,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
int_pause = 0;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (use_gui) {
if (config_glx_gui(d_width, d_height) == -1)
return -1;
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 78c66f9269..85a975944a 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -44,7 +44,7 @@ int XShmGetEventBase(Display *);
#include "mp_msg.h"
#include "help_mp.h"
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#include "mplayer.h"
#endif
@@ -369,7 +369,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
aspect = ((1 << 16) * d_width + d_height / 2) / d_height;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (use_gui)
guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window
else
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index 175bda9533..1e1edd91aa 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -43,7 +43,7 @@ static unsigned int timer = 0;
static unsigned int timerd = 0;
#endif
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
@@ -171,7 +171,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
initialized = 1;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (use_gui)
guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window
else
diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c
index 98566689d6..3383eab2d3 100644
--- a/libvo/vo_xover.c
+++ b/libvo/vo_xover.c
@@ -32,7 +32,7 @@
#include "aspect.h"
#include "mp_msg.h"
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
@@ -258,7 +258,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
vo_dy += xinerama_y;
vo_dwidth=d_width; vo_dheight=d_height;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if(use_gui) guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window
else
{
@@ -308,7 +308,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &mGCV);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
}
#endif
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index b4e20f59d8..2ccbc41f03 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -41,7 +41,7 @@ Buffer allocation:
#include "input/input.h"
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
@@ -224,7 +224,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
return -1;
}
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (use_gui)
guiGetEvent(guiSetShVideo, 0); // let the GUI to setup/resize our window
else
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index c56e52d4cf..fab2752e4e 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -33,7 +33,7 @@
#include "vosub_vidix.h"
#include "vidix/vidix.h"
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
@@ -273,7 +273,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
}
mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (use_gui)
guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window
else
@@ -341,7 +341,7 @@ static int c