summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cfg-mplayer.h4
-rwxr-xr-xconfigure46
-rw-r--r--gui/skin/skin.c6
-rw-r--r--gui/wm/ws.c20
-rw-r--r--gui/wm/ws.h2
-rw-r--r--libvo/mga_common.c2
-rw-r--r--libvo/video_out.c8
-rw-r--r--libvo/vo_dga.c44
-rw-r--r--libvo/vo_dxr3.c16
-rw-r--r--libvo/vo_sdl.c8
-rw-r--r--libvo/vo_x11.c12
-rw-r--r--libvo/vo_xmga.c2
-rw-r--r--libvo/vo_xover.c4
-rw-r--r--libvo/vo_xv.c10
-rw-r--r--libvo/vo_xvidix.c4
-rw-r--r--libvo/vo_xvmc.c12
-rw-r--r--libvo/x11_common.c28
-rw-r--r--libvo/x11_common.h4
-rw-r--r--mplayer.c8
-rw-r--r--vidix/radeon_vid.c10
20 files changed, 125 insertions, 125 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 052e80885c..996432f9ef 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -123,7 +123,7 @@ const m_option_t mplayer_opts[]={
CONF_TYPE_PRINT, 0, 0, 0, NULL},
{"edlout", &edl_output_filename, CONF_TYPE_STRING, 0, 0, 0, NULL},
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
{"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL},
#endif
@@ -199,7 +199,7 @@ const m_option_t mplayer_opts[]={
{"adapter", &vo_adapter_num, CONF_TYPE_INT, CONF_RANGE, 0, 5, NULL},
{"refreshrate",&vo_refresh_rate,CONF_TYPE_INT,CONF_RANGE, 0,100, NULL},
{"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL},
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
// x11,xv,xmga,xvidix
{"icelayer", "-icelayer has been removed. Use -fstype layer:<number> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
{"stop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL},
diff --git a/configure b/configure
index b97d7e66a8..92ddcd7d09 100755
--- a/configure
+++ b/configure
@@ -3971,12 +3971,12 @@ EOF
done
fi
if test "$_x11" = yes ; then
- _def_x11='#define HAVE_X11 1'
+ _def_x11='#define CONFIG_X11 1'
_vosrc="$_vosrc x11_common.c vo_x11.c vo_xover.c"
_vomodules="x11 xover $_vomodules"
else
_x11=no
- _def_x11='#undef HAVE_X11'
+ _def_x11='#undef CONFIG_X11'
_novomodules="x11 $_novomodules"
_res_comment="check if the dev(el) packages are installed"
# disable stuff that depends on X
@@ -3995,10 +3995,10 @@ EOF
cc_check -lXss && _xss=yes
fi
if test "$_xss" = yes ; then
- _def_xss='#define HAVE_XSS 1'
+ _def_xss='#define CONFIG_XSS 1'
_libs_mplayer="$_libs_mplayer -lXss"
else
- _def_xss='#undef HAVE_XSS'
+ _def_xss='#undef CONFIG_XSS'
fi
echores "$_xss"
@@ -4023,16 +4023,16 @@ EOF
cc_check -lXext && _xdpms4=yes
fi
if test "$_xdpms4" = yes ; then
- _def_xdpms='#define HAVE_XDPMS 1'
+ _def_xdpms='#define CONFIG_XDPMS 1'
_res_comment="using Xdpms 4"
echores "yes"
elif test "$_xdpms3" = yes ; then
- _def_xdpms='#define HAVE_XDPMS 1'
+ _def_xdpms='#define CONFIG_XDPMS 1'
_libs_mplayer="$_libs_mplayer -lXdpms"
_res_comment="using Xdpms 3"
echores "yes"
else
- _def_xdpms='#undef HAVE_XDPMS'
+ _def_xdpms='#undef CONFIG_XDPMS'
echores "no"
fi
@@ -4052,12 +4052,12 @@ EOF
fi
if test "$_xv" = yes ; then
- _def_xv='#define HAVE_XV 1'
+ _def_xv='#define CONFIG_XV 1'
_libs_mplayer="$_libs_mplayer -lXv"
_vosrc="$_vosrc vo_xv.c"
_vomodules="xv $_vomodules"
else
- _def_xv='#undef HAVE_XV'
+ _def_xv='#undef CONFIG_XV'
_novomodules="xv $_novomodules"
fi
echores "$_xv"
@@ -4105,10 +4105,10 @@ EOF
fi
if test "$_xinerama" = yes ; then
- _def_xinerama='#define HAVE_XINERAMA 1'
+ _def_xinerama='#define CONFIG_XINERAMA 1'
_libs_mplayer="$_libs_mplayer -lXinerama"
else
- _def_xinerama='#undef HAVE_XINERAMA'
+ _def_xinerama='#undef CONFIG_XINERAMA'
fi
echores "$_xinerama"
@@ -4129,10 +4129,10 @@ EOF
cc_check -lXxf86vm && _vm=yes
fi
if test "$_vm" = yes ; then
- _def_vm='#define HAVE_XF86VM 1'
+ _def_vm='#define CONFIG_XF86VM 1'
_libs_mplayer="$_libs_mplayer -lXxf86vm"
else
- _def_vm='#undef HAVE_XF86VM'
+ _def_vm='#undef CONFIG_XF86VM'
fi
echores "$_vm"
@@ -4151,9 +4151,9 @@ EOF
cc_check && _xf86keysym=yes
fi
if test "$_xf86keysym" = yes ; then
- _def_xf86keysym='#define HAVE_XF86XK 1'
+ _def_xf86keysym='#define CONFIG_XF86XK 1'
else
- _def_xf86keysym='#undef HAVE_XF86XK'
+ _def_xf86keysym='#undef CONFIG_XF86XK'
fi
echores "$_xf86keysym"
@@ -4178,20 +4178,20 @@ EOF
fi
_dga=no
-_def_dga='#undef HAVE_DGA'
-_def_dga1='#undef HAVE_DGA1'
-_def_dga2='#undef HAVE_DGA2'
+_def_dga='#undef CONFIG_DGA'
+_def_dga1='#undef CONFIG_DGA1'
+_def_dga2='#undef CONFIG_DGA2'
if test "$_dga1" = yes ; then
_dga=yes
- _def_dga1='#define HAVE_DGA1 1'
+ _def_dga1='#define CONFIG_DGA1 1'
_res_comment="using DGA 1.0"
elif test "$_dga2" = yes ; then
_dga=yes
- _def_dga2='#define HAVE_DGA2 1'
+ _def_dga2='#define CONFIG_DGA2 1'
_res_comment="using DGA 2.0"
fi
if test "$_dga" = yes ; then
- _def_dga='#define HAVE_DGA 1'
+ _def_dga='#define CONFIG_DGA 1'
_libs_mplayer="$_libs_mplayer -lXxf86dga"
_vosrc="$_vosrc vo_dga.c"
_vomodules="dga $_vomodules"
@@ -7404,7 +7404,7 @@ EOF
cc_check -lXext && _xshape=yes
fi
if test "$_xshape" = yes ; then
- _def_xshape='#define HAVE_XSHAPE 1'
+ _def_xshape='#define CONFIG_XSHAPE 1'
else
die "The GUI requires the X11 extension XShape (which was not found)."
fi
@@ -8706,7 +8706,7 @@ $_def_twolame
/* used by GUI: */
$_def_xshape
-#if defined(CONFIG_GL) || defined(HAVE_X11) || defined(HAVE_XV)
+#if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV)
#define X11_FULLSCREEN 1
#endif
diff --git a/gui/skin/skin.c b/gui/skin/skin.c
index c5a6ec0b92..064bde68cb 100644
--- a/gui/skin/skin.c
+++ b/gui/skin/skin.c
@@ -169,7 +169,7 @@ int cmd_base( char * in )
if ( skinBPRead( tmp,&defList->main.Bitmap ) ) return 1;
defList->main.width=defList->main.Bitmap.Width;
defList->main.height=defList->main.Bitmap.Height;
-#ifdef HAVE_XSHAPE
+#ifdef CONFIG_XSHAPE
Convert32to1( &defList->main.Bitmap,&defList->main.Mask,0x00ff00ff );
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->main.Mask.Width,defList->main.Mask.Height );
#else
@@ -201,7 +201,7 @@ int cmd_base( char * in )
if ( skinBPRead( tmp,&defList->menuBase.Bitmap ) ) return 1;
defList->menuBase.width=defList->menuBase.Bitmap.Width;
defList->menuBase.height=defList->menuBase.Bitmap.Height;
-#ifdef HAVE_XSHAPE
+#ifdef CONFIG_XSHAPE
Convert32to1( &defList->menuBase.Bitmap,&defList->menuBase.Mask,0x00ff00ff );
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->menuBase.Mask.Width,defList->menuBase.Mask.Height );
#else
@@ -219,7 +219,7 @@ int cmd_base( char * in )
if ( skinBPRead( tmp,&defList->bar.Bitmap ) ) return 1;
defList->bar.width=defList->bar.Bitmap.Width;
defList->bar.height=defList->bar.Bitmap.Height;
-#ifdef HAVE_XSHAPE
+#ifdef CONFIG_XSHAPE
Convert32to1( &defList->bar.Bitmap,&defList->bar.Mask,0x00ff00ff );
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->bar.Mask.Width,defList->bar.Mask.Height );
#else
diff --git a/gui/wm/ws.c b/gui/wm/ws.c
index 34aa58c842..65ec992d58 100644
--- a/gui/wm/ws.c
+++ b/gui/wm/ws.c
@@ -48,15 +48,15 @@
#include "wsxdnd.h"
#include <X11/extensions/XShm.h>
-#ifdef HAVE_XSHAPE
+#ifdef CONFIG_XSHAPE
#include <X11/extensions/shape.h>
#endif
-#ifdef HAVE_XINERAMA
+#ifdef CONFIG_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
#include <X11/extensions/xf86vmode.h>
#endif
@@ -235,7 +235,7 @@ wsXDNDInitialize();
mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_NoXshm );
wsUseXShm=0;
}
-#ifdef HAVE_XSHAPE
+#ifdef CONFIG_XSHAPE
if ( !XShapeQueryExtension( wsDisplay,&eventbase,&errorbase ) )
{
mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_NoXshape );
@@ -249,7 +249,7 @@ wsXDNDInitialize();
wsScreen=DefaultScreen( wsDisplay );
wsRootWin=RootWindow( wsDisplay,wsScreen );
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
{
int clock;
XF86VidModeModeLine modeline;
@@ -278,7 +278,7 @@ wsXDNDInitialize();
int minor,major,shp;
mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] Screen depth: %d\n",wsDepthOnScreen );
mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] size: %dx%d\n",wsMaxX,wsMaxY );
-#ifdef HAVE_XINERAMA
+#ifdef CONFIG_XINERAMA
mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] origin: +%d+%d\n",wsOrgX,wsOrgY );
#endif
mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] red mask: 0x%x\n",wsRedMask );
@@ -289,7 +289,7 @@ wsXDNDInitialize();
XShmQueryVersion( wsDisplay,&major,&minor,&shp );
mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] XShm version is %d.%d\n",major,minor );
}
- #ifdef HAVE_XSHAPE
+ #ifdef CONFIG_XSHAPE
if ( wsUseXShape )
{
XShapeQueryVersion( wsDisplay,&major,&minor );
@@ -1220,7 +1220,7 @@ static int timeout_save=0;
void wsScreenSaverOn( Display *mDisplay )
{
int nothing;
-#ifdef HAVE_XDPMS
+#ifdef CONFIG_XDPMS
if ( dpms_disabled )
{
if ( DPMSQueryExtension( mDisplay,&nothing,&nothing ) )
@@ -1250,7 +1250,7 @@ void wsScreenSaverOn( Display *mDisplay )
void wsScreenSaverOff( Display * mDisplay )
{
int interval,prefer_blank,allow_exp,nothing;
-#ifdef HAVE_XDPMS
+#ifdef CONFIG_XDPMS
if ( DPMSQueryExtension( mDisplay,&nothing,&nothing ) )
{
BOOL onoff;
@@ -1273,7 +1273,7 @@ void wsScreenSaverOff( Display * mDisplay )
void wsSetShape( wsTWindow * win,char * data )
{
-#ifdef HAVE_XSHAPE
+#ifdef CONFIG_XSHAPE
if ( !wsUseXShape ) return;
if ( data )
{
diff --git a/gui/wm/ws.h b/gui/wm/ws.h
index e782edd6d3..73321c6ae9 100644
--- a/gui/wm/ws.h
+++ b/gui/wm/ws.h
@@ -27,7 +27,7 @@
#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <X11/extensions/XShm.h>
-#ifdef HAVE_XDPMS
+#ifdef CONFIG_XDPMS
#include <X11/extensions/dpms.h>
#endif
diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index 5d45434a30..e7705025b5 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -512,7 +512,7 @@ static void set_window( void ){
vo_dwidth=drwWidth; vo_dheight=drwHeight;
#ifdef VO_XMGA
-#ifdef HAVE_XINERAMA
+#ifdef CONFIG_XINERAMA
if(XineramaIsActive(mDisplay))
{
XineramaScreenInfo *screens;
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 52ff35e323..c59b408d47 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -149,10 +149,10 @@ const vo_functions_t* const video_out_drivers[] =
#ifdef CONFIG_3DFX
&video_out_3dfx,
#endif
-#ifdef HAVE_XV
+#ifdef CONFIG_XV
&video_out_xv,
#endif
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
&video_out_x11,
&video_out_xover,
#endif
@@ -160,7 +160,7 @@ const vo_functions_t* const video_out_drivers[] =
&video_out_gl,
&video_out_gl2,
#endif
-#ifdef HAVE_DGA
+#ifdef CONFIG_DGA
&video_out_dga,
#endif
#ifdef CONFIG_SDL
@@ -211,7 +211,7 @@ const vo_functions_t* const video_out_drivers[] =
&video_out_dfbmga,
#endif
#ifdef CONFIG_VIDIX
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
&video_out_xvidix,
#endif
#ifdef WIN32
diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c
index eedafb717b..a3f2901eb3 100644
--- a/libvo/vo_dga.c
+++ b/libvo/vo_dga.c
@@ -37,15 +37,15 @@
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
#include <X11/extensions/xf86vmode.h>
#endif
static const vo_info_t info = {
-#ifdef HAVE_DGA2
+#ifdef CONFIG_DGA2
"DGA ( Direct Graphic Access V2.0 )",
#else
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
"DGA ( Direct Graphic Access V1.0+XF86VidModeExt. )",
#else
"DGA ( Direct Graphic Access V1.0 )",
@@ -186,7 +186,7 @@ static char *vd_GetModeString(int index)
//-----------------------------------------------------------------
-#if defined(HAVE_XF86VM) && !defined(HAVE_DGA2)
+#if defined(CONFIG_XF86VM) && !defined(CONFIG_DGA2)
static XF86VidModeModeInfo **vo_dga_vidmodes = NULL;
#endif
@@ -213,7 +213,7 @@ static int vo_dga_src_mode = 0; // index in mode list that is used by
// codec
static int vo_dga_XServer_mode = 0; // index in mode list for resolution
-#ifdef HAVE_DGA2
+#ifdef CONFIG_DGA2
static XDGAMode *vo_modelines;
static int vo_modecount;
#endif
@@ -350,7 +350,7 @@ static void flip_page(void)
{
if (1 < vo_dga_nr_video_buffers)
{
-#ifdef HAVE_DGA2
+#ifdef CONFIG_DGA2
XDGASetViewport(mDisplay, mScreen,
0, CURRENT_VIDEO_BUFFER.y, XDGAFlipRetrace);
#else
@@ -387,7 +387,7 @@ static int query_format(uint32_t format)
static void uninit(void)
{
-#ifdef HAVE_DGA2
+#ifdef CONFIG_DGA2
XDGADevice *dgadevice;
#endif
@@ -401,7 +401,7 @@ static void uninit(void)
if (vo_grabpointer)
XUngrabPointer(mDisplay, CurrentTime);
XUngrabKeyboard(mDisplay, CurrentTime);
-#ifdef HAVE_DGA2
+#ifdef CONFIG_DGA2
XDGACloseFramebuffer(mDisplay, mScreen);
dgadevice = XDGASetMode(mDisplay, mScreen, 0);
if (dgadevice != NULL)
@@ -411,7 +411,7 @@ static void uninit(void)
#else
XF86DGADirectVideo(mDisplay, mScreen, 0);
// first disable DirectVideo and then switch mode back!
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if (vo_dga_vidmodes != NULL)
{
int screen;
@@ -537,7 +537,7 @@ static int config(uint32_t width, uint32_t height,
static unsigned char *vo_dga_base;
static int prev_width, prev_height;
-#ifdef HAVE_DGA2
+#ifdef CONFIG_DGA2
// needed to change DGA video mode
int mX = VO_DGA_INVALID_RES, mY = VO_DGA_INVALID_RES, mVBI =
100000, mMaxY = 0, i, j = 0;
@@ -545,7 +545,7 @@ static int config(uint32_t width, uint32_t height,
XDGAMode *modeline;
XDGADevice *dgadevice;
#else
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
unsigned int vm_event, vm_error;
unsigned int vm_ver, vm_rev;
int i, j = 0, have_vm = 0;
@@ -591,7 +591,7 @@ static int config(uint32_t width, uint32_t height,
// choose a suitable mode ...
-#ifdef HAVE_DGA2
+#ifdef CONFIG_DGA2
// Code to change the video mode added by Michael Graffam
// mgraffam@idsi.net
@@ -664,7 +664,7 @@ static int config(uint32_t width, uint32_t height,
#else
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
mp_msg(MSGT_VO, MSGL_INFO,
"vo_dga: DGA 1.0 compatibility code: Using XF86VidMode for mode switching!\n");
@@ -738,8 +738,8 @@ static int config(uint32_t width, uint32_t height,
mp_msg(MSGT_VO, MSGL_ERR,
"vo_dga: Sorry, video larger than viewport is not yet supported!\n");
// ugly, do something nicer in the future ...
-#ifndef HAVE_DGA2
-#ifdef HAVE_XF86VM
+#ifndef CONFIG_DGA2
+#ifdef CONFIG_XF86VM
if (vo_dga_vidmodes)
{
XFree(vo_dga_vidmodes);
@@ -756,8 +756,8 @@ static int config(uint32_t width, uint32_t height,
"vo_dga: Something is wrong with your DGA. There doesn't seem to be a\n"
" single suitable mode!\n"
" Please file a bug report (see DOCS/HTML/en/bugreports.html)\n");
-#ifndef HAVE_DGA2
-#ifdef HAVE_XF86VM
+#ifndef CONFIG_DGA2
+#ifdef CONFIG_XF86VM
if (vo_dga_vidmodes)
{
XFree(vo_dga_vidmodes);
@@ -771,7 +771,7 @@ static int config(uint32_t width, uint32_t height,
if (!vo_config_count || width != prev_width || height != prev_height)
{
-#ifdef HAVE_DGA2
+#ifdef CONFIG_DGA2
if (!XDGAOpenFramebuffer(mDisplay, mScreen))
{
@@ -790,7 +790,7 @@ static int config(uint32_t width, uint32_t height,
#else
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if (have_vm)
{
XF86VidModeLockModeSwitch(mDisplay, mScreen, 0);
@@ -853,7 +853,7 @@ static int config(uint32_t width, uint32_t height,
init_video_buffers(vo_dga_base,
vo_dga_vp_height,
vo_dga_width * HW_MODE.vdm_bytespp,
-#ifdef HAVE_DGA2
+#ifdef CONFIG_DGA2
modeline->maxViewportY,
#else
vo_dga_vp_height,
@@ -892,7 +892,7 @@ static int preinit(const char *arg)
if (vo_dga_XServer_mode == 0)
{
-#ifndef HAVE_DGA2
+#ifndef CONFIG_DGA2
mp_msg(MSGT_VO, MSGL_ERR,
"vo_dga: Your X-Server is not running in a ");
mp_msg(MSGT_VO, MSGL_ERR,
@@ -903,7 +903,7 @@ static int preinit(const char *arg)
// vd_GetModeString(vo_dga_XServer_mode));
//}
-#ifdef HAVE_DGA2
+#ifdef CONFIG_DGA2
vo_modelines = XDGAQueryModes(mDisplay, mScreen, &vo_modecount);
if (vo_modelines)
{
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index f2b3fd2a2d..820123aec9 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -35,7 +35,7 @@
#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
#include "x11_common.h"
#endif
#include "libavutil/avstring.h"
@@ -152,7 +152,7 @@ static int overlay_signalmode(overlay_t *o, int mode);
/* End overlay.h */
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
#define KEY_COLOR 0x80a040
static XWindowAttributes xwin_attribs;
static overlay_t *overlay_data;
@@ -178,7 +178,7 @@ static int control(uint32_t request, void *data, ...)
return VO_ERROR;
}
return VO_TRUE;
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
case VOCTRL_ONTOP:
vo_x11_ontop();
return VO_TRUE;
@@ -469,7 +469,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
#endif
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
if (dxr3_overlay) {
XVisualInfo vinfo;
XSetWindowAttributes xswa;
@@ -645,7 +645,7 @@ static int draw_frame(uint8_t * src[])
static void flip_page(void)
{
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
if (dxr3_overlay) {
int event = vo_x11_check_events(mDisplay);
if (event & VO_EVENT_RESIZE) {
@@ -699,7 +699,7 @@ static int draw_slice(uint8_t *srcimg[], int stride[], int w, int h, int x0, int
static void uninit(void)
{
mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_Uninitializing);
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
if (dxr3_overlay) {
overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF);
overlay_release(overlay_data);
@@ -757,7 +757,7 @@ static int preinit(const char *arg)
mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UsingNewSyncEngine);
dxr3_newsync = 1;
} else if (!strncmp("overlay", arg, 7) && !dxr3_overlay) {
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UsingOverlay);
dxr3_overlay = 1;
#else
@@ -857,7 +857,7 @@ static int preinit(const char *arg)
}
strcpy(fds_name, devname);
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
if (dxr3_overlay) {
/* Fucked up hack needed to enable overlay.
diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c
index 2074a5d31f..4fca181e24 100644
--- a/libvo/vo_sdl.c
+++ b/libvo/vo_sdl.c
@@ -70,7 +70,7 @@
#include "aspect.h"
#include "libmpcodecs/vfcap.h"
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
#include <X11/Xlib.h>
#include "x11_common.h"
#endif
@@ -1189,7 +1189,7 @@ static void check_events (void)
}
else if ( keypressed == SDLK_n ) {
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
aspect(&priv->dstwidth, &priv->dstheight,A_NOZOOM);
#endif
if (priv->surface->w != priv->dstwidth || priv->surface->h != priv->dstheight) {
@@ -1523,7 +1523,7 @@ query_format(uint32_t format)
static void
uninit(void)
{
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
struct sdl_priv_s *priv = &sdl_priv;
if(priv->X) {
if( mp_msg_test(MSGT_VO,MSGL_V) ) {
@@ -1599,7 +1599,7 @@ static int preinit(const char *arg)
mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SDL_UsingDriver, priv->driver);
priv->X = 0;
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
if(vo_init()) {
if( mp_msg_test(MSGT_VO,MSGL_V) ) {
mp_msg(MSGT_VO,MSGL_V, "SDL: deactivating XScreensaver/DPMS\n"); }
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 85a975944a..5f139287d2 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -11,7 +11,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
#include <X11/extensions/xf86vmode.h>
#endif
#include <errno.h>
@@ -317,7 +317,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
unsigned long xswamask;
const struct fmt2Xfmtentry_s *fmte = fmt2Xfmt;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
unsigned int modeline_width, modeline_height;
static uint32_t vm_width;
static uint32_t vm_height;
@@ -375,7 +375,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
else
#endif
{
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if (vm)
{
if ((d_width == 0) && (d_height == 0))
@@ -405,7 +405,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
xswa.colormap = theCmap;
xswamask = CWBackPixel | CWBorderPixel | CWColormap;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if (vm)
{
xswa.override_redirect = True;
@@ -452,7 +452,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
ButtonReleaseMask |
PointerMotionMask)));
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if (vm)
{
/* Grab the mouse pointer in our window */
@@ -725,7 +725,7 @@ static void uninit(void)
freeMyXImage();
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
vo_vm_close(mDisplay);
#endif
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index 1e1edd91aa..0a91b57415 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -29,7 +29,7 @@
#include <X11/Xutil.h>
#include <errno.h>
-#ifdef HAVE_XINERAMA
+#ifdef CONFIG_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c
index 3383eab2d3..0420b2be0e 100644
--- a/libvo/vo_xover.c
+++ b/libvo/vo_xover.c
@@ -24,7 +24,7 @@
#include <X11/Xutil.h>
//#include <X11/keysym.h>
-#ifdef HAVE_XINERAMA
+#ifdef CONFIG_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
@@ -111,7 +111,7 @@ static void set_window(int force_update)
vo_dwidth=drwWidth; vo_dheight=drwHeight;
-#ifdef HAVE_XINERAMA
+#ifdef CONFIG_XINERAMA
if (XineramaIsActive(mDisplay))
{
XineramaScreenInfo *screens;
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 2ccbc41f03..f84f99fb83 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -174,7 +174,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
unsigned long xswamask;
int depth;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
int vm = 0;
unsigned int modeline_width, modeline_height;
static uint32_t vm_width;
@@ -198,7 +198,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
int_pause = 0;
visible_buf = -1;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if (flags & VOFLAG_MODESWITCHING)
vm = 1;
#endif
@@ -234,7 +234,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
hint.y = vo_dy;
hint.width = d_width;
hint.height = d_height;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if (vm)
{
if ((d_width == 0) && (d_height == 0))
@@ -308,7 +308,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
XFreeGC(mDisplay, vo_gc);
vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv);
XSync(mDisplay, False);
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if (vm)
{
/* Grab the mouse pointer in our window */
@@ -710,7 +710,7 @@ static void uninit(void)
}
for (i = 0; i < num_buffers; i++)
deallocate_xvimage(i);
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
vo_vm_close(mDisplay);
#endif
mp_input_rm_event_fd(ConnectionNumber(mDisplay));
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index fab2752e4e..206f0228a9 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -22,7 +22,7 @@
#include <X11/Xutil.h>
//#include <X11/keysym.h>
-#ifdef HAVE_XINERAMA
+#ifdef CONFIG_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
@@ -124,7 +124,7 @@ static void set_window(int force_update)
vo_dwidth = drwWidth;
vo_dheight = drwHeight;
-#ifdef HAVE_XINERAMA
+#ifdef CONFIG_XINERAMA
if (XineramaIsActive(mDisplay))
{
XineramaScreenInfo *screens;
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index 55ebec49fc..3ad41b5ac9 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -38,7 +38,7 @@
#include "libavutil/common.h"
//no chance for xinerama to be supported in the near future
-#undef HAVE_XINERAMA
+#undef CONFIG_XINERAMA
#undef NDEBUG
#include <assert.h>
@@ -463,7 +463,7 @@ XSetWindowAttributes xswa;
XWindowAttributes attribs;
unsigned long xswamask;
int depth;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
int vm=0;
unsigned int modeline_width, modeline_height;
static uint32_t vm_width;
@@ -641,7 +641,7 @@ skip_surface_allocation:
vo_mouse_autohide = 1;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if( flags&VOFLAG_MODESWITCHING ) vm = 1;
#endif
@@ -655,7 +655,7 @@ skip_surface_allocation:
hint.y = vo_dy;
hint.width = d_width;
hint.height = d_height;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if ( vm )
{
if ((d_width==0) && (d_height==0))
@@ -707,7 +707,7 @@ skip_surface_allocation:
if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &xgcv);
XSync(mDisplay, False);
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
if ( vm )
{
/* Grab the mouse pointer in our window */
@@ -1153,7 +1153,7 @@ static void uninit(void){
printf("vo_xvmc: uninit called\n"); }
xvmc_free();
//from vo_xv
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
vo_vm_close(mDisplay);
#endif
vo_x11_uninit();
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 97cc1e4a0b..65b88cb307 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -26,27 +26,27 @@
#include <X11/Xutil.h>
#include <X11/Xatom.h>
-#ifdef HAVE_XSS
+#ifdef CONFIG_XSS
#include <X11/extensions/scrnsaver.h>
#endif
-#ifdef HAVE_XDPMS
+#ifdef CONFIG_XDPMS
#include <X11/extensions/dpms.h>
#endif
-#ifdef HAVE_XINERAMA
+#ifdef CONFIG_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
#include <X11/extensions/xf86vmode.h>
#endif
-#ifdef HAVE_XF86XK
+#ifdef CONFIG_XF86XK
#include <X11/XF86keysym.h>
#endif
-#ifdef HAVE_XV
+#ifdef CONFIG_XV
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
@@ -112,7 +112,7 @@ static int vo_old_y = 0;
static int vo_old_width = 0;
static int vo_old_height = 0;
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
XF86VidModeModeInfo **vidmodes = NULL;
XF86VidModeModeLine modeline;
#endif
@@ -369,7 +369,7 @@ static void init_atoms(void)
void update_xinerama_info(void) {
int screen = xinerama_screen;
xinerama_x = xinerama_y = 0;
-#ifdef HAVE_XINERAMA
+#ifdef CONFIG_XINERAMA
if (screen >= -1 && XineramaIsActive(mDisplay))
{
XineramaScreenInfo *screens;
@@ -450,7 +450,7 @@ int vo_init(void)
init_atoms();
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
{
int clock;
@@ -1615,7 +1615,7 @@ void xscreensaver_heartbeat(void)
static int xss_suspend(Bool suspend)
{
-#ifndef HAVE_XSS
+#ifndef CONFIG_XSS
return 0;
#else
int event, error, major, minor;
@@ -1641,7 +1641,7 @@ void saver_on(Display * mDisplay)
screensaver_off = 0;
if (xss_suspend(False))
return;
-#ifdef HAVE_XDPMS
+#ifdef CONFIG_XDPMS
if (dpms_disabled)
{
int nothing;
@@ -1682,7 +1682,7 @@ void saver_off(Display * mDisplay)
screensaver_off = 1;
if (xss_suspend(True))
return;
-#ifdef HAVE_XDPMS
+#ifdef CONFIG_XDPMS
if (DPMSQueryExtension(mDisplay, &nothing, &nothing))
{
BOOL onoff;
@@ -1754,7 +1754,7 @@ void vo_x11_selectinput_witherr(Display * display, Window w,
}
}
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
void vo_vm_switch(uint32_t X, uint32_t Y, int *modeline_width,
int *modeline_height)
{
@@ -2044,7 +2044,7 @@ uint32_t vo_x11_get_equalizer(char *name, int *value)
return VO_TRUE;
}
-#ifdef HAVE_XV
+#ifdef CONFIG_XV
int vo_xv_set_eq(uint32_t xv_port, char *name, int value)
{