diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-10-09 11:12:53 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:18:09 +0200 |
commit | 107845e9dbe41a3fabf1c440561c10ae302ff5fb (patch) | |
tree | cb06d2c0625bdae4591c52d591386f6aa02a8937 /libvo/vo_xmga.c | |
parent | deba9f3d2bc171d1b987162a30a62cf06af45126 (diff) | |
download | mpv-107845e9dbe41a3fabf1c440561c10ae302ff5fb.tar.bz2 mpv-107845e9dbe41a3fabf1c440561c10ae302ff5fb.tar.xz |
vo_mga: switch to newer screen dimension handling API
Switch (x)mga vo to new libvo API to reduce code duplication and improve
consistency between vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32453 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xmga.c')
-rw-r--r-- | libvo/vo_xmga.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c index d7628503fe..1308711569 100644 --- a/libvo/vo_xmga.c +++ b/libvo/vo_xmga.c @@ -71,8 +71,6 @@ static int colorkey; static uint32_t mvHeight; static uint32_t mvWidth; -static Window mRoot; - static XSetWindowAttributes xWAttribs; static int initialized = 0; @@ -131,25 +129,9 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, if (mga_init(width, height, format)) return -1; // ioctl errors? - aspect_save_orig(width, height); - aspect_save_prescale(d_width, d_height); - update_xinerama_info(); - mvWidth = width; mvHeight = height; - vo_panscan_x = vo_panscan_y = vo_panscan_amount = 0; - - aspect(&d_width, &d_height, A_NOZOOM); - vo_dx = (vo_screenwidth - d_width) / 2; - vo_dy = (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; - r = (vo_colorkey & 0x00ff0000) >> 16; g = (vo_colorkey & 0x0000ff00) >> 8; b = vo_colorkey & 0x000000ff; @@ -177,10 +159,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, initialized = 1; - { - if (flags & VOFLAG_FULLSCREEN) - aspect(&dwidth, &dheight, A_ZOOM); - XGetWindowAttributes(mDisplay, mRootWin, &attribs); mDepth = attribs.depth; if (mDepth != 15 && mDepth != 16 && mDepth != 24 && mDepth != 32) @@ -196,17 +174,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, flags, xWAttribs.colormap, "xmga", title); XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xWAttribs); - } - - if ((flags & VOFLAG_FULLSCREEN) && (!WinID)) - { - vo_dx = 0; - vo_dy = 0; - vo_dwidth = vo_screenwidth; - vo_dheight = vo_screenheight; - vo_fs = 1; - } - panscan_calc(); mga_vid_config.colkey_on = 1; |