From 41c1749f46e0e36af39be2487ee992cbf18e6679 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 10 Feb 2013 09:50:12 +0100 Subject: core: move `xineramascreen` to `MPOpts` as `vo_screen_id` This is a small cleanup in preparation for the next commit. --- video/out/x11_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'video/out/x11_common.c') diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 959c0888fd..a3bf5c10cf 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -376,8 +376,8 @@ void vo_x11_update_screeninfo(struct vo *vo) struct MPOpts *opts = vo->opts; xinerama_x = xinerama_y = 0; #ifdef CONFIG_XINERAMA - if (xinerama_screen >= -1 && XineramaIsActive(vo->x11->display)) { - int screen = xinerama_screen; + if (opts->vo_screen_id >= -1 && XineramaIsActive(vo->x11->display)) { + int screen = opts->vo_screen_id; XineramaScreenInfo *screens; int num_screens; @@ -994,7 +994,7 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y, struct MPOpts *opts = vo->opts; struct vo_x11_state *x11 = vo->x11; Display *mDisplay = vo->x11->display; - bool force_change_xy = opts->vo_geometry.xy_valid || xinerama_screen >= 0; + bool force_change_xy = opts->vo_geometry.xy_valid || opts->vo_screen_id >= 0; XVisualInfo vinfo_storage; if (!vis) { vis = &vinfo_storage; -- cgit v1.2.3