RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-11 04:01:31 +00:00
Code Issues Releases Wiki Activity

vo: remove old stuff

Browse Source
This commit is contained in:
wm4 2014-05-06 23:20:33 +02:00
parent f0ee4e8766
commit 5704958573
3 changed files with 0 additions and 26 deletions
options
options.h
video/out
vo.cvo.h

2
options/options.h
View File

@ -8,8 +8,6 @@
typedef struct mp_vo_opts { typedef struct mp_vo_opts {
struct m_obj_settings *video_driver_list, *vo_defs; struct m_obj_settings *video_driver_list, *vo_defs;
int screenwidth;
int screenheight;
int ontop; int ontop;
int fullscreen; int fullscreen;
int screen_id; int screen_id;

16
video/out/vo.c
View File

@ -36,7 +36,6 @@
#include "bstr/bstr.h" #include "bstr/bstr.h"
#include "vo.h" #include "vo.h"
#include "aspect.h" #include "aspect.h"
#include "win_state.h"
#include "input/input.h" #include "input/input.h"
#include "options/m_config.h" #include "options/m_config.h"
#include "common/msg.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); talloc_free(vo->params);
vo->params = talloc_memdup(vo, params, sizeof(*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); int ret = vo->driver->reconfig(vo, vo->params, flags);
vo->config_ok = ret >= 0; vo->config_ok = ret >= 0;
if (vo->config_ok) { if (vo->config_ok) {

8
video/out/vo.h
View File

@ -68,7 +68,6 @@ enum mp_voctrl {
VOCTRL_SET_DEINTERLACE, VOCTRL_SET_DEINTERLACE,
VOCTRL_GET_DEINTERLACE, VOCTRL_GET_DEINTERLACE,
VOCTRL_UPDATE_SCREENINFO,
VOCTRL_WINDOW_TO_OSD_COORDS, // float[2] (x/y) VOCTRL_WINDOW_TO_OSD_COORDS, // float[2] (x/y)
VOCTRL_GET_WINDOW_SIZE, // int[2] (w/h) VOCTRL_GET_WINDOW_SIZE, // int[2] (w/h)
VOCTRL_SET_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; struct input_ctx *input_ctx;
int event_fd; // check_events() should be called when this has input 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 // current window state
int dwidth; int dwidth;
int dheight; int dheight;