From 5704958573b15e7851d5428c4eb4d7c20283ef7c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 6 May 2014 23:20:33 +0200
Subject: vo: remove old stuff

---
 video/out/vo.c | 16 ----------------
 video/out/vo.h |  8 --------
 2 files changed, 24 deletions(-)

(limited to 'video')

diff --git a/video/out/vo.c b/video/out/vo.c
index dd65552ec0..61143ea340 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -36,7 +36,6 @@
 #include "bstr/bstr.h"
 #include "vo.h"
 #include "aspect.h"
-#include "win_state.h"
 #include "input/input.h"
 #include "options/m_config.h"
 #include "common/msg.h"
@@ -255,21 +254,6 @@ int vo_reconfig(struct vo *vo, struct mp_image_params *params, int flags)
     talloc_free(vo->params);
     vo->params = talloc_memdup(vo, params, sizeof(*params));
 
-    // Emulate the old way of calculating the window geometry settings.
-    if (vo_control(vo, VOCTRL_UPDATE_SCREENINFO, NULL) == VO_TRUE) {
-        struct mp_rect rc = {
-            vo->xinerama_x,
-            vo->xinerama_y,
-            vo->xinerama_x + vo->opts->screenwidth,
-            vo->xinerama_y + vo->opts->screenheight,
-        };
-        struct vo_win_geometry geo;
-        vo_calc_window_geometry(vo, &rc, &geo);
-        vo_apply_window_geometry(vo, &geo);
-        vo->dx = geo.win.x0;
-        vo->dy = geo.win.y0;
-    }
-
     int ret = vo->driver->reconfig(vo, vo->params, flags);
     vo->config_ok = ret >= 0;
     if (vo->config_ok) {
diff --git a/video/out/vo.h b/video/out/vo.h
index 8ee53f9420..fe7fd151e8 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -68,7 +68,6 @@ enum mp_voctrl {
     VOCTRL_SET_DEINTERLACE,
     VOCTRL_GET_DEINTERLACE,
 
-    VOCTRL_UPDATE_SCREENINFO,
     VOCTRL_WINDOW_TO_OSD_COORDS,        // float[2] (x/y)
     VOCTRL_GET_WINDOW_SIZE,             // int[2] (w/h)
     VOCTRL_SET_WINDOW_SIZE,             // int[2] (w/h)
@@ -259,13 +258,6 @@ struct vo {
     struct input_ctx *input_ctx;
     int event_fd;  // check_events() should be called when this has input
 
-    // requested position/resolution (usually window position/window size)
-    int dx;
-    int dy;
-
-    int xinerama_x;
-    int xinerama_y;
-
     // current window state
     int dwidth;
     int dheight;
-- 
cgit v1.2.3