Rename two GUI-related preprocessor directives:

HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2

12 files changed, 36 insertions, 36 deletions

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 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_xvmc.c b/libvo/vo_xvmc.c
index 1471f5956a..55ebec49fc 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -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
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 4a78b25b04..97cc1e4a0b 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -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 * mydisplay)
     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 * mydisplay)
                 {
                     int key;
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
                     if ( use_gui ) { break; }
 #endif
 
@@ -1113,7 +1113,7 @@ int vo_x11_check_events(Display * mydisplay)
                     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 * mydisplay)
                     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, int *modeline_width,
 
 void vo_vm_close(Display * dpy)
 {
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
     if (vidmodes != NULL && vo_window != None)
 #else
     if (vidmodes != NULL)