diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-02-10 09:50:12 +0100 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-02-21 22:23:08 +0100 |
| commit | 41c1749f46e0e36af39be2487ee992cbf18e6679 (patch) | |
| tree | be025ef8861bed3f6ce95685044ba45c807b971f /video/out/x11_common.c | |
| parent | 08952f23dd4b069990b027dc06b10affcb4bc361 (diff) | |
| download | mpv-41c1749f46e0e36af39be2487ee992cbf18e6679.tar.bz2 mpv-41c1749f46e0e36af39be2487ee992cbf18e6679.tar.xz | |
core: move `xineramascreen` to `MPOpts` as `vo_screen_id`
This is a small cleanup in preparation for the next commit.
Diffstat (limited to 'video/out/x11_common.c')
| -rw-r--r-- | video/out/x11_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |