diff options
author | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-18 02:42:20 +0000 |
---|---|---|
committer | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-18 02:42:20 +0000 |
commit | 14fe0175c05de7e246e7674740209f19ebe4f5e1 (patch) | |
tree | cef2ab06a3c3435184c798b0b54b5c2ba89d8f22 /libvo/vo_xv.c | |
parent | 50f2513fc8d4017a4b4a8a97dcfda2a545979f52 (diff) | |
download | mpv-14fe0175c05de7e246e7674740209f19ebe4f5e1.tar.bz2 mpv-14fe0175c05de7e246e7674740209f19ebe4f5e1.tar.xz |
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2250 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xv.c')
-rw-r--r-- | libvo/vo_xv.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 840b227a87..92b60faaef 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -132,6 +132,9 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t XSetWindowAttributes xswa; unsigned long xswamask; + aspect_save_orig(width,height); + aspect_save_prescale(d_width,d_height); + image_height = height; image_width = width; image_format=format; @@ -142,11 +145,12 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t #endif mFullscreen=flags&1; - dwidth=d_width; dheight=d_height; num_buffers=vo_doublebuffering?NUM_BUFFERS:1; if (!vo_init()) return -1; + aspect_save_screenres(vo_screenwidth,vo_screenheight); + #ifdef HAVE_NEW_GUI if ( vo_window == None ) { @@ -155,6 +159,8 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t hint.y = 0; hint.width = d_width; hint.height = d_height; + aspect(&d_width,&d_height,A_NOZOOM); + if ( mFullscreen ) { hint.width=vo_screenwidth; @@ -167,13 +173,11 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t * irritated for now (and send lots o' mails ;) ::atmos */ - { - aspect(&d_width,&d_height,vo_screenwidth,vo_screenheight); - dwidth=d_width; dheight=d_height; - } + aspect(&d_width,&d_height,A_ZOOM); #endif } + dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for? hint.flags = PPosition | PSize; XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); depth=attribs.depth; |