diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-30 13:44:59 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-30 13:44:59 +0000 |
commit | 3b31fa5717f26ac8de703ed2681c9e42ac181e60 (patch) | |
tree | a09e8cbd7701bdd7f63158f8219263493f1d1eee /libvo/vo_dxr3.c | |
parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
download | mpv-3b31fa5717f26ac8de703ed2681c9e42ac181e60.tar.bz2 mpv-3b31fa5717f26ac8de703ed2681c9e42ac181e60.tar.xz |
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
Diffstat (limited to 'libvo/vo_dxr3.c')
-rw-r--r-- | libvo/vo_dxr3.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 } |