Wed Jul 30 15:44:59 CEST 2008

Author: diego
Date: Wed Jul 30 15:44:59 2008
New Revision: 27375

Log:
Rename two GUI-related preprocessor directives:
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2


Modified:
   trunk/cfg-mplayer.h
   trunk/codec-cfg.c
   trunk/command.c
   trunk/configure
   trunk/gui/mplayer/gtk/about.c
   trunk/gui/mplayer/gtk/opts.c
   trunk/gui/mplayer/widgets.c
   trunk/input/input.c
   trunk/libvo/mga_common.c
   trunk/libvo/vo_directx.c
   trunk/libvo/vo_dxr3.c
   trunk/libvo/vo_gl.c
   trunk/libvo/vo_gl2.c
   trunk/libvo/vo_x11.c
   trunk/libvo/vo_xmga.c
   trunk/libvo/vo_xover.c
   trunk/libvo/vo_xv.c
   trunk/libvo/vo_xvidix.c
   trunk/libvo/vo_xvmc.c
   trunk/libvo/x11_common.c
   trunk/mp_msg.c
   trunk/mpcommon.c
   trunk/mplayer.c
   trunk/stream/cache2.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-dk.h
   trunk/help/help_mp-el.h
   trunk/help/help_mp-es.h
   trunk/help/help_mp-fr.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-nb.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_TW.h

Modified: trunk/cfg-mplayer.h
==============================================================================

--- trunk/cfg-mplayer.h	(original)
+++ trunk/cfg-mplayer.h	Wed Jul 30 15:44:59 2008
@@ -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},

Modified: trunk/codec-cfg.c
==============================================================================
--- trunk/codec-cfg.c	(original)
+++ trunk/codec-cfg.c	Wed Jul 30 15:44:59 2008
@@ -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

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	(original)
+++ trunk/command.c	Wed Jul 30 15:44:59 2008
@@ -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_opti
 	    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_cm
 		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_cm
 #endif
 
 	default:
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 	    if ((use_gui) && (cmd->id > MP_CMD_GUI_EVENTS))
 		guiGetEvent(guiIEvent, (char *) cmd->id);
 	    else

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Wed Jul 30 15:44:59 2008
@@ -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

Modified: trunk/gui/mplayer/gtk/about.c
==============================================================================
--- trunk/gui/mplayer/gtk/about.c	(original)
+++ trunk/gui/mplayer/gtk/about.c	Wed Jul 30 15:44:59 2008
@@ -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,

Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c	(original)
+++ trunk/gui/mplayer/gtk/opts.c	Wed Jul 30 15:44:59 2008
@@ -782,7 +782,7 @@ static void prCListRow( GtkCList * clist
 	     !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

Modified: trunk/gui/mplayer/widgets.c
==============================================================================
--- trunk/gui/mplayer/widgets.c	(original)
+++ trunk/gui/mplayer/widgets.c	Wed Jul 30 15:44:59 2008
@@ -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 );

Modified: trunk/input/input.c
==============================================================================
--- trunk/input/input.c	(original)
+++ trunk/input/input.c	Wed Jul 30 15:44:59 2008
@@ -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

Modified: trunk/libvo/mga_common.c
==============================================================================
--- trunk/libvo/mga_common.c	(original)
+++ trunk/libvo/mga_common.c	Wed Jul 30 15:44:59 2008
@@ -317,7 +317,7 @@ static int control(uint32_t request, voi
       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

Modified: trunk/libvo/vo_directx.c
==============================================================================
--- trunk/libvo/vo_directx.c	(original)
+++ trunk/libvo/vo_directx.c	Wed Jul 30 15:44:59 2008
@@ -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, 
     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);
     }

Modified: trunk/libvo/vo_dxr3.c
==============================================================================
--- trunk/libvo/vo_dxr3.c	(original)
+++ trunk/libvo/vo_dxr3.c	Wed Jul 30 15:44:59 2008
@@ -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
 		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
 	}

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	(original)
+++ trunk/libvo/vo_gl.c	Wed Jul 30 15:44:59 2008
@@ -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, 
   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);

Modified: trunk/libvo/vo_gl2.c
==============================================================================
--- trunk/libvo/vo_gl2.c	(original)
+++ trunk/libvo/vo_gl2.c	Wed Jul 30 15:44:59 2008
@@ -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, ui
 }
 #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, 
 
   int_pause = 0;
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if (use_gui) {
     if (config_glx_gui(d_width, d_height) == -1)
       return -1;

Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c	(original)
+++ trunk/libvo/vo_x11.c	Wed Jul 30 15:44:59 2008
@@ -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
 
     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

Modified: trunk/libvo/vo_xmga.c
==============================================================================
--- trunk/libvo/vo_xmga.c	(original)
+++ trunk/libvo/vo_xmga.c	Wed Jul 30 15:44:59 2008
@@ -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
 
     initialized = 1;
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if (use_gui)
         guiGetEvent(guiSetShVideo, 0);  // the GUI will set up / resize the window
     else

Modified: trunk/libvo/vo_xover.c
==============================================================================
--- trunk/libvo/vo_xover.c	(original)
+++ trunk/libvo/vo_xover.c	Wed Jul 30 15:44:59 2008
@@ -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
   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
 	 
       if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
       vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &mGCV);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     }
 #endif
 

Modified: trunk/libvo/vo_xv.c
==============================================================================
--- trunk/libvo/vo_xv.c	(original)
+++ trunk/libvo/vo_xv.c	Wed Jul 30 15:44:59 2008
@@ -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
             return -1;
     }
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if (use_gui)
         guiGetEvent(guiSetShVideo, 0);  // let the GUI to setup/resize our window
     else

Modified: trunk/libvo/vo_xvidix.c
==============================================================================
--- trunk/libvo/vo_xvidix.c	(original)
+++ trunk/libvo/vo_xvidix.c	Wed Jul 30 15:44:59 2008
@@ -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
     }
     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 config(uint32_t width, uint32
         if (vo_gc != None)
             XFreeGC(mDisplay, vo_gc);
         vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &mGCV);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     }
 #endif
 

Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c	(original)
+++ trunk/libvo/vo_xvmc.c	Wed Jul 30 15:44:59 2008
@@ -31,7 +31,7 @@
 
 #include "subopt-helper.h"
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 #include "gui/interface.h"
 #endif
 
@@ -645,7 +645,7 @@ skip_surface_allocation:
    if( flags&VOFLAG_MODESWITCHING ) vm = 1;
 #endif
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
    if(use_gui)
       guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window
    else

Modified: trunk/libvo/x11_common.c
==============================================================================
--- trunk/libvo/x11_common.c	(original)
+++ trunk/libvo/x11_common.c	Wed Jul 30 15:44:59 2008
@@ -56,7 +56,7 @@
 #include "input/input.h"
 #include "input/mouse.h"
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 #include "gui/interface.h"
 #include "mplayer.h"
 #endif
@@ -956,7 +956,7 @@ GC vo_gc = NULL;
 GC f_gc = NULL;
 XSizeHints vo_hint;
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 void vo_setwindow(Window w, GC g)
 {
     vo_window = w;
@@ -975,7 +975,7 @@ void vo_x11_uninit(void)
         XFreeGC(mDisplay, f_gc);
         f_gc = NULL;
     }
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     /* destroy window only if it's not controlled by the GUI */
     if (!use_gui)
 #endif
@@ -1031,7 +1031,7 @@ int vo_x11_check_events(Display * mydisp
     while (XPending(mydisplay))
     {
         XNextEvent(mydisplay, &Event);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
         if (use_gui)
         {
             guiGetEvent(0, (char *) &Event);
@@ -1075,7 +1075,7 @@ int vo_x11_check_events(Display * mydisp
                 {
                     int key;
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
                     if ( use_gui ) { break; }
 #endif
 
@@ -1113,7 +1113,7 @@ int vo_x11_check_events(Display * mydisp
                     mouse_waiting_hide = 1;
                     mouse_timer = GetTimerMS();
                 }
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
                 // Ignore mouse button 1-3 under GUI.
                 if (use_gui && (Event.xbutton.button >= 1)
                     && (Event.xbutton.button <= 3))
@@ -1129,7 +1129,7 @@ int vo_x11_check_events(Display * mydisp
                     mouse_waiting_hide = 1;
                     mouse_timer = GetTimerMS();
                 }
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
                 // Ignore mouse button 1-3 under GUI.
                 if (use_gui && (Event.xbutton.button >= 1)
                     && (Event.xbutton.button <= 3))
@@ -1807,7 +1807,7 @@ void vo_vm_switch(uint32_t X, uint32_t Y
 
 void vo_vm_close(Display * dpy)
 {
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if (vidmodes != NULL && vo_window != None)
 #else
     if (vidmodes != NULL)

Modified: trunk/mp_msg.c
==============================================================================
--- trunk/mp_msg.c	(original)
+++ trunk/mp_msg.c	Wed Jul 30 15:44:59 2008
@@ -12,11 +12,11 @@ extern char* get_term_charset(void);
 #endif
 
 #if defined(FOR_MENCODER)
-#undef HAVE_NEW_GUI
+#undef CONFIG_GUI
 int use_gui;
 #endif
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 #include "gui/interface.h"
 #endif
 #include "mp_msg.h"
@@ -179,7 +179,7 @@ void mp_msg(int mod, int lev, const char
     tmp[MSGSIZE_MAX-2] = '\n';
     tmp[MSGSIZE_MAX-1] = 0;
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if(use_gui)
         guiMessageBox(lev, tmp);
 #endif

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	(original)
+++ trunk/mpcommon.c	Wed Jul 30 15:44:59 2008
@@ -210,26 +210,26 @@ int select_audio(demuxer_t* demuxer, int
 /* Parse -noconfig common to both programs */
 int disable_system_conf=0;
 int disable_user_conf=0;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 int disable_gui_conf=0;
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
 
 /* Disable all configuration files */
 static void noconfig_all(void)
 {
     disable_system_conf = 1;
     disable_user_conf = 1;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     disable_gui_conf = 1;
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
 }
 
 const m_option_t noconfig_opts[] = {
     {"all", noconfig_all, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL},
     {"system", &disable_system_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
     {"user", &disable_user_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     {"gui", &disable_gui_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
     {NULL, NULL, 0, 0, 0, 0, NULL}
 };

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Wed Jul 30 15:44:59 2008
@@ -76,7 +76,7 @@
 
 #include "cpudetect.h"
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 #include "gui/interface.h"
 #endif
 
@@ -224,7 +224,7 @@ float playback_speed=1.0;
 
 int use_gui=0;
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 int enqueue=0;
 #endif
 
@@ -588,7 +588,7 @@ void uninit_player(unsigned int mask){
     initialized_flags&=~INITIALIZED_ACODEC;
     current_module="uninit_acodec";
     if(mpctx->sh_audio) uninit_audio(mpctx->sh_audio);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if (use_gui) guiGetEvent(guiSetAfilter, (char *)NULL);
 #endif
     mpctx->sh_audio=NULL;
@@ -663,7 +663,7 @@ void uninit_player(unsigned int mask){
     mpctx->audio_out->uninit(mpctx->eof?0:1); mpctx->audio_out=NULL;
   }
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if(mask&INITIALIZED_GUI){
     initialized_flags&=~INITIALIZED_GUI;
     current_module="uninit_gui";
@@ -692,7 +692,7 @@ void exit_player_with_rc(const char* how
   timeEndPeriod(1);
 #endif
 #ifdef HAVE_X11
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if ( !use_gui )
 #endif
   vo_uninit();	// Close the X11 connection (if any is open).
@@ -980,7 +980,7 @@ static int playtree_add_playlist(play_tr
 {
   play_tree_add_bpf(entry,filename);
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if (use_gui) {
     if (entry) {
       import_playtree_playlist_into_gui(entry, mconfig);
@@ -1296,7 +1296,7 @@ int build_afilter_chain(sh_audio_t *sh_a
   int result;
   if (!sh_audio)
   {
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if (use_gui) guiGetEvent(guiSetAfilter, (char *)NULL);
 #endif
     mpctx->mixer.afilter = NULL;
@@ -1320,7 +1320,7 @@ int build_afilter_chain(sh_audio_t *sh_a
   result =  init_audio_filters(sh_audio, new_srate,
            &ao_data->samplerate, &ao_data->channels, &ao_data->format);
   mpctx->mixer.afilter = sh_audio->afilter;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if (use_gui) guiGetEvent(guiSetAfilter, (char *)sh_audio->afilter);
 #endif
   return result;
@@ -2342,7 +2342,7 @@ static void pause_loop(void)
 	    mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused);
         mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n");
     }
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if (use_gui)
 	guiGetEvent(guiCEvent, (char *)guiSetPause);
 #endif
@@ -2361,7 +2361,7 @@ static void pause_loop(void)
 	}
 	if (mpctx->sh_video && mpctx->video_out && vo_config_count)
 	    mpctx->video_out->check_events();
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 	if (use_gui) {
 	    guiEventHandling();
 	    guiGetEvent(guiReDraw, NULL);
@@ -2385,7 +2385,7 @@ static void pause_loop(void)
     if (mpctx->video_out && mpctx->sh_video && vo_config_count)
         mpctx->video_out->control(VOCTRL_RESUME, NULL);	// resume video
     (void)GetRelativeTime();	// ignore time that passed during pause
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if (use_gui) {
 	if (guiIntfStruct.Playing == guiSetStop)
 	    mpctx->eof = 1;
@@ -2595,7 +2595,7 @@ int gui_no_filename=0;
 
     parse_cfgfiles(mconfig);
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if ( use_gui ) cfg_read();
 #endif
 
@@ -2616,7 +2616,7 @@ int gui_no_filename=0;
     }
     }
 	
-#if defined(WIN32) && defined(HAVE_NEW_GUI)
+#if defined(WIN32) && defined(CONFIG_GUI)
     void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows");
     if(runningmplayer && filename && use_gui){
         COPYDATASTRUCT csData;
@@ -2645,7 +2645,7 @@ int gui_no_filename=0;
 		SetPriorityClass(GetCurrentProcess(), priority_presets_defs[i].prio);
 	}
 #endif	
-#ifndef HAVE_NEW_GUI
+#ifndef CONFIG_GUI
     if(use_gui){
       mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui);
       use_gui=0;
@@ -2672,7 +2672,7 @@ int gui_no_filename=0;
       // Import initital playtree into GUI.
       import_initial_playtree_into_gui(mpctx->playtree, mconfig, enqueue);
     }
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
 
     if(video_driver_list && strcmp(video_driver_list[0],"help")==0){
       list_video_out();
@@ -2840,7 +2840,7 @@ if(!codecs_file || !parse_codec_cfg(code
 	    mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_UsingRTCTiming, irqp);
     }
   }
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 // breaks DGA and SVGAlib and VESA drivers:  --A'rpi
 // and now ? -- Pontscho
     if(use_gui) setuid( getuid() ); // strongly test, please check this.
@@ -2920,7 +2920,7 @@ current_module = NULL;
 #endif
 #endif
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if(use_gui){
        guiInit();
        guiGetEvent(guiSetContext, mpctx);
@@ -2960,7 +2960,7 @@ if(!noconsolecontrols && !slave_mode){
 }
 
 // =================== GUI idle loop (STOP state) ===========================
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if ( use_gui ) {
       mpctx->file_format=DEMUXER_TYPE_UNKNOWN;
       guiGetEvent( guiSetDefaults,0 );
@@ -2998,7 +2998,7 @@ if(!noconsolecontrols && !slave_mode){
          }
        } 
     }
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
 
 while (player_idle_mode && !filename) {
     play_tree_t * entry = NULL;
@@ -3142,7 +3142,7 @@ if (edl_output_filename) {
   }
   initialized_flags|=INITIALIZED_STREAM;
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   if ( use_gui ) guiGetEvent( guiSetStream,(char *)mpctx->stream );
 #endif
 
@@ -3622,7 +3622,7 @@ if(force_fps && mpctx->sh_video){
   mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,mpctx->sh_video->fps,mpctx->sh_video->frametime);
 }
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 if ( use_gui ) {
     if ( mpctx->sh_audio ) guiIntfStruct.AudioType=mpctx->sh_audio->channels; else guiIntfStruct.AudioType=0;
     if ( !mpctx->sh_video && mpctx->sh_audio ) guiGetEvent( guiSetAudioOnly,(char *)1 ); else guiGetEvent( guiSetAudioOnly,(char *)0 );
@@ -3738,7 +3738,7 @@ if(!mpctx->sh_video) {
 //    current_module="draw_osd";
 //    if(vo_config_count) mpctx->video_out->draw_osd();
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if(use_gui) guiEventHandling();
 #endif
 
@@ -3887,7 +3887,7 @@ if(rel_seek_secs || abs_seek_pos){
   edl_decision = 0;
 }
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
       if(use_gui){
         guiEventHandling();
 	if(mpctx->demuxer->file_format==DEMUXER_TYPE_AVI && mpctx->sh_video && mpctx->sh_video->video.dwLength>2){
@@ -3912,7 +3912,7 @@ if(rel_seek_secs || abs_seek_pos){
 	 }
 #endif
       }
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
 
 } // while(!mpctx->eof)
 
@@ -4020,7 +4020,7 @@ while(mpctx->playtree_iter != NULL) {
         break;
 }
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 if(use_gui && !mpctx->playtree_iter) {
 #ifdef CONFIG_DVDREAD
     if(!guiIntfStruct.DiskChanged)

Modified: trunk/stream/cache2.c
==============================================================================
--- trunk/stream/cache2.c	(original)
+++ trunk/stream/cache2.c	Wed Jul 30 15:44:59 2008
@@ -369,7 +369,7 @@ static void ThreadProc( void *s ){
 #endif
 #endif
   
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
   use_gui = 0; // mp_msg may not use gui stuff in forked code
 #endif
 // cache thread mainloop:

