diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-20 23:29:28 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:46:40 +0300 |
| commit | eaab1ce896adbcb58e6503ea2dcf789d99bd29f5 (patch) | |
| tree | 40a03206817797e1e293185e6df304c4cb63165f /libvo/video_out.c | |
| parent | 7521aac66509d18666b7737160153986cc1437ac (diff) | |
| download | mpv-eaab1ce896adbcb58e6503ea2dcf789d99bd29f5.tar.bz2 mpv-eaab1ce896adbcb58e6503ea2dcf789d99bd29f5.tar.xz | |
Move vo_dx,vo_dy,vo_dwidth,vo_dheight to vo struct
Diffstat (limited to 'libvo/video_out.c')
| -rw-r--r-- | libvo/video_out.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 6cab65d25f..1f527af08f 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -36,10 +36,6 @@ int vo_screenwidth=0; int vo_screenheight=0; // requested resolution/bpp: (-x -y -bpp options) -int vo_dx=0; -int vo_dy=0; -int vo_dwidth=0; -int vo_dheight=0; int vo_dbpp=0; int vo_nomouse_input = 0; @@ -367,14 +363,14 @@ int vo_config(struct vo *vo, uint32_t width, uint32_t height, if (vo_control(vo, VOCTRL_UPDATE_SCREENINFO, NULL) == VO_TRUE) { aspect(&d_width, &d_height, A_NOZOOM); - vo_dx = (int)(vo_screenwidth - d_width) / 2; - vo_dy = (int)(vo_screenheight - d_height) / 2; - geometry(&vo_dx, &vo_dy, &d_width, &d_height, + vo->dx = (int)(vo_screenwidth - d_width) / 2; + vo->dy = (int)(vo_screenheight - d_height) / 2; + geometry(&vo->dx, &vo->dy, &d_width, &d_height, vo_screenwidth, vo_screenheight); - vo_dx += xinerama_x; - vo_dy += xinerama_y; - vo_dwidth = d_width; - vo_dheight = d_height; + vo->dx += xinerama_x; + vo->dy += xinerama_y; + vo->dwidth = d_width; + vo->dheight = d_height; } int ret = vo->driver->config(vo, width, height, d_width, d_height, flags, |