summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
Diffstat (limited to 'libvo')
-rw-r--r--libvo/font_load_ft.c6
-rw-r--r--libvo/mga_common.c2
-rw-r--r--libvo/video_out.c46
-rw-r--r--libvo/video_out.h4
-rw-r--r--libvo/vo_directx.c4
-rw-r--r--libvo/vo_dxr3.c12
-rw-r--r--libvo/vo_ggi.c14
-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.c14
16 files changed, 70 insertions, 70 deletions
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c
index 5d99a59b5f..ee7c1dae9b 100644
--- a/libvo/font_load_ft.c
+++ b/libvo/font_load_ft.c
@@ -16,7 +16,7 @@
#include <math.h>
#include <string.h>
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
#include <iconv.h>
#endif
@@ -716,7 +716,7 @@ static int generate_tables(font_desc_t *desc, double thickness, double radius)
return 0;
}
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
/* decode from 'encoding' to unicode */
static FT_ULong decode_char(iconv_t *cd, char c) {
FT_ULong o;
@@ -1009,7 +1009,7 @@ font_desc_t* read_font_desc_ft(const char *fname, int movie_width, int movie_hei
}
desc->face_cnt++;
-#ifdef CONFIG_ICONV
+#ifdef HAVE_ICONV
if (unicode) {
charset_size = prepare_charset_unicode(face, my_charset, my_charcodes);
} else {
diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index acd7d88cd2..9fe2777b4f 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -313,7 +313,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/video_out.c b/libvo/video_out.c
index ba5051d4c4..e932e3c59c 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -103,13 +103,13 @@ extern struct vo_driver video_out_md5sum;
const struct vo_driver *video_out_drivers[] =
{
-#ifdef HAVE_XVR100
+#ifdef CONFIG_XVR100
&video_out_xvr100,
#endif
-#ifdef HAVE_TDFX_VID
+#ifdef CONFIG_TDFX_VID
&video_out_tdfx_vid,
#endif
-#ifdef HAVE_DIRECTX
+#ifdef CONFIG_DIRECTX
&video_out_directx,
#endif
#ifdef HAVE_COREVIDEO
@@ -118,19 +118,19 @@ const struct vo_driver *video_out_drivers[] =
#ifdef HAVE_QUARTZ
&video_out_quartz,
#endif
-#ifdef HAVE_XMGA
+#ifdef CONFIG_XMGA
&video_out_xmga,
#endif
-#ifdef HAVE_MGA
+#ifdef CONFIG_MGA
&video_out_mga,
#endif
-#ifdef HAVE_TDFXFB
+#ifdef CONFIG_TDFXFB
&video_out_tdfxfb,
#endif
-#ifdef HAVE_S3FB
+#ifdef CONFIG_S3FB
&video_out_s3fb,
#endif
-#ifdef HAVE_3DFX
+#ifdef CONFIG_3DFX
&video_out_3dfx,
#endif
#ifdef HAVE_XV
@@ -140,30 +140,30 @@ const struct vo_driver *video_out_drivers[] =
&video_out_x11,
&video_out_xover,
#endif
-#ifdef HAVE_GL
+#ifdef CONFIG_GL
&video_out_gl,
&video_out_gl2,
#endif
#ifdef HAVE_DGA
&video_out_dga,
#endif
-#ifdef HAVE_SDL
+#ifdef CONFIG_SDL
&video_out_sdl,
#endif
-#ifdef HAVE_GGI
+#ifdef CONFIG_GGI
&video_out_ggi,
#endif
-#ifdef HAVE_FBDEV
+#ifdef CONFIG_FBDEV
&video_out_fbdev,
&video_out_fbdev2,
#endif
-#ifdef HAVE_SVGALIB
+#ifdef CONFIG_SVGALIB
&video_out_svga,
#endif
-#ifdef HAVE_AA
+#ifdef CONFIG_AA
&video_out_aa,
#endif
-#ifdef HAVE_CACA
+#ifdef CONFIG_CACA
&video_out_caca,
#endif
#ifdef HAVE_DXR2
@@ -182,16 +182,16 @@ const struct vo_driver *video_out_drivers[] =
&video_out_zr,
&video_out_zr2,
#endif
-#ifdef HAVE_BL
+#ifdef CONFIG_BL
&video_out_bl,
#endif
-#ifdef HAVE_VESA
+#ifdef CONFIG_VESA
&video_out_vesa,
#endif
-#ifdef HAVE_DIRECTFB
+#ifdef CONFIG_DIRECTFB
&video_out_directfb,
#endif
-#ifdef HAVE_DFBMGA
+#ifdef CONFIG_DFBMGA
&video_out_dfbmga,
#endif
#ifdef CONFIG_VIDIX
@@ -209,7 +209,7 @@ const struct vo_driver *video_out_drivers[] =
&video_out_xvmc,
#endif
&video_out_mpegpes,
-#ifdef HAVE_YUV4MPEG
+#ifdef CONFIG_YUV4MPEG
&video_out_yuv4mpeg,
#endif
#ifdef HAVE_PNG
@@ -221,13 +221,13 @@ const struct vo_driver *video_out_drivers[] =
#ifdef HAVE_GIF
&video_out_gif89a,
#endif
-#ifdef HAVE_TGA
+#ifdef CONFIG_TGA
&video_out_tga,
#endif
#ifdef HAVE_PNM
&video_out_pnm,
#endif
-#ifdef HAVE_MD5SUM
+#ifdef CONFIG_MD5SUM
&video_out_md5sum,
#endif
NULL
@@ -381,7 +381,7 @@ int vo_config(struct vo *vo, uint32_t width, uint32_t height,
return ret;
}
-#if defined(HAVE_FBDEV)||defined(HAVE_VESA)
+#if defined(CONFIG_FBDEV)||defined(CONFIG_VESA)
/* Borrowed from vo_fbdev.c
Monitor ranges related functions*/
diff --git a/libvo/video_out.h b/libvo/video_out.h
index 6a9908e19b..e392b55f2b 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -286,7 +286,7 @@ extern int vo_colorkey;
extern int WinID;
-#if defined(HAVE_FBDEV) || defined(HAVE_VESA)
+#if defined(CONFIG_FBDEV) || defined(CONFIG_VESA)
typedef struct {
float min;
@@ -300,6 +300,6 @@ extern char *monitor_hfreq_str;
extern char *monitor_vfreq_str;
extern char *monitor_dotclock_str;
-#endif /* defined(HAVE_FBDEV) || defined(HAVE_VESA) */
+#endif /* defined(CONFIG_FBDEV) || defined(CONFIG_VESA) */
#endif /* MPLAYER_VIDEO_OUT_H */
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index 7053c8bc01..67ed453d04 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
@@ -1291,7 +1291,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 2e8e7cedc5..982a8eb265 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
@@ -476,7 +476,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);
@@ -693,12 +693,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
}
@@ -875,14 +875,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_ggi.c b/libvo/vo_ggi.c
index b3f970ad8c..935e64ea95 100644
--- a/libvo/vo_ggi.c
+++ b/libvo/vo_ggi.c
@@ -29,7 +29,7 @@
#include <ggi/ggi.h>
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
#include <ggi/wmh.h>
#endif
@@ -72,7 +72,7 @@ static struct ggi_conf_s {
} ggi_conf;
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
static void window_ontop(void)
{
mp_msg(MSGT_VO, MSGL_V, "[ggi] debug: window_ontop() called\n");
@@ -163,7 +163,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
#endif
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
ggiWmhSetTitle(ggi_conf.vis, title);
if (vo_ontop) window_ontop();
#endif
@@ -397,7 +397,7 @@ static int preinit(const char *arg)
mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize GGI\n");
return -1;
}
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
if (ggiWmhInit() < 0) {
mp_msg(MSGT_VO, MSGL_FATAL, "[ggi] unable to initialize libggiwmh\n");
return -1;
@@ -426,7 +426,7 @@ static int preinit(const char *arg)
ggi_conf.drawvis = ggi_conf.vis;
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
ggiWmhAttach(ggi_conf.vis);
#endif
@@ -442,7 +442,7 @@ static void uninit(void)
if (ggi_conf.driver)
free(ggi_conf.driver);
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
ggiWmhDetach(ggi_conf.vis);
ggiWmhExit();
#endif
@@ -461,7 +461,7 @@ static int control(uint32_t request, void *data)
return query_format(*((uint32_t *) data));
case VOCTRL_GET_IMAGE:
return get_image(data);
-#ifdef HAVE_GGIWMH
+#ifdef CONFIG_GGIWMH
case VOCTRL_ONTOP:
vo_ontop = (!(vo_ontop));
window_ontop();
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 5a1f3c43ff..f1431e227c 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 9af9b255c5..d7814948aa 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 fd44bbf3dd..4c2e1e5ff8 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 04f51790e6..1a2f833913 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 d63b2f732d..b7082ed44c 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -46,7 +46,7 @@ Buffer allocation:
#include "input/input.h"
#include "mp_fifo.h"
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
@@ -221,7 +221,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height,
if (!ctx->xv_format)
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 f2136817ae..9e14eac9e7 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 7a60e2bbbd..56d57c16c2 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 858acda3be..de3a8411fd 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -58,7 +58,7 @@
#include "input/input.h"
#include "input/mouse.h"
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
#include "gui/interface.h"
#include "mplayer.h"
#endif
@@ -943,7 +943,7 @@ void vo_x11_uninit(struct vo *vo)
XFreeGC(vo->x11->display, x11->f_gc);
x11->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
@@ -998,7 +998,7 @@ int vo_x11_check_events(struct vo *vo)
while (XPending(display))
{
XNextEvent(display, &Event);
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (use_gui)
{
guiGetEvent(0, (char *) &Event);
@@ -1042,7 +1042,7 @@ int vo_x11_check_events(struct vo *vo)
{
int key;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if ( use_gui ) { break; }
#endif
@@ -1081,7 +1081,7 @@ int vo_x11_check_events(struct vo *vo)
x11->mouse_waiting_hide = 1;
x11->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))
@@ -1098,7 +1098,7 @@ int vo_x11_check_events(struct vo *vo)
x11->mouse_waiting_hide = 1;
x11->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))
@@ -1797,7 +1797,7 @@ void vo_vm_close(struct vo *vo)
{
Display *dpy = vo->x11->display;
struct MPOpts *opts = vo->opts;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
if (vidmodes != NULL && vo->x11->vo_window != None)
#else
if (vidmodes != NULL)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 06:00:09 +0000