From 0535a14505c367693fe729a3f1348c4ffd516af3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 27 Jan 2013 07:21:10 +0100 Subject: x11: reduce VO mode switching code duplication Some parts for initiating mode switches were duplicated in every VO supporting X11 (except vo_opengl/gl_common, which didn't support mode switching). Move this to x11_common.c. Note that this might be slightly risky: is it really guaranteed that no VO needed to do "special" setup that depends on X parameters changing after a mode switch, such as bit depth, visuals etc.? From what I can see, this shouldn't be the case (X probably can't even change depth on the fly). Even if this should be a one-way road, VM switching is in general very useless, and its implementation buggy, so it can just be removed should unfixable problems arise. --- video/out/x11_common.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'video/out/x11_common.h') diff --git a/video/out/x11_common.h b/video/out/x11_common.h index 170418ec56..ab3539b36b 100644 --- a/video/out/x11_common.h +++ b/video/out/x11_common.h @@ -130,11 +130,7 @@ void vo_x11_ontop(struct vo *vo); void vo_x11_border(struct vo *vo); void vo_x11_update_screeninfo(struct vo *vo); -#ifdef CONFIG_XF86VM -void vo_vm_switch(struct vo *vo); -void vo_vm_close(struct vo *vo); -double vo_vm_get_fps(struct vo *vo); -#endif +double vo_x11_vm_get_fps(struct vo *vo); void xscreensaver_heartbeat(struct vo_x11_state *x11); -- cgit v1.2.3