From 435d7c97c900a53adedcca32b07bb4a9a5f890d3 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Tue, 21 Aug 2012 18:52:31 +0300 Subject: cleanup: remove pointless #defines Remove the following #defines, which should never change in practice: CONFIG_FAKE_MONO, OUTBURST, FAST_OSD, FAST_OSD_TABLE The configure script hardcoded these to particular values in config.h. They could only be changed by manually editing it. I don't think anyone would want to. X11_FULLSCREEN This once did something, but became meaningless years ago and was now always set to true if the files using it were compiled at all. Conflicts: configure libvo/osd.c libvo/vo_gl.c Merged from mplayer2. The OSD defines were already removed in this fork. --- libvo/x11_common.c | 4 ---- libvo/x11_common.h | 7 ------- 2 files changed, 11 deletions(-) (limited to 'libvo') diff --git a/libvo/x11_common.c b/libvo/x11_common.c index fc6875b7d5..39c876ce3e 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -31,8 +31,6 @@ #include "x11_common.h" #include "talloc.h" -#ifdef X11_FULLSCREEN - #include #include #include @@ -1749,8 +1747,6 @@ double vo_vm_get_fps(struct vo *vo) } #endif -#endif /* X11_FULLSCREEN */ - /* * Scan the available visuals on this Display/Screen. Try to find diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 87be7181f3..cb8b39a3b1 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -98,12 +98,6 @@ struct vo_x11_state { Atom XA_NET_WM_CM; }; -#if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV) -#define X11_FULLSCREEN 1 -#endif - -#ifdef X11_FULLSCREEN - #define vo_wm_LAYER 1 #define vo_wm_FULLSCREEN 2 #define vo_wm_STAYS_ON_TOP 4 @@ -150,7 +144,6 @@ void vo_x11_ontop(struct vo *vo); void vo_x11_border(struct vo *vo); void vo_x11_ewmh_fullscreen(struct vo_x11_state *x11, int action); -#endif int vo_xv_set_eq(struct vo *vo, uint32_t xv_port, const char *name, int value); int vo_xv_get_eq(struct vo *vo, uint32_t xv_port, const char *name, int *value); -- cgit v1.2.3