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

Save the new width and height earlier so that e.g. -geometry 30x30-50-50

Browse Source 
gives the correct behaviour - before placement would depend on the
original movie size instead of the one scaled according to -geometry.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30823 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-03-03 21:01:57 +00:00
parent 90188f0e5f
commit baae4d1add
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libvo/geometry.c
View File

@ -77,10 +77,16 @@ int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh)
return 0;
}
mp_msg(MSGT_VO, MSGL_V,"geometry window parameter: widw: %i,"
" widh: %i, scrw: %i, scrh: %i\n",*widw, *widh, scrw, scrh);
mp_msg(MSGT_VO, MSGL_V,"geometry set to width: %i,"
"height: %i, xoff: %s%i, yoff: %s%i, xper: %i, yper: %i\n",
width, height, xsign, xoff, ysign, yoff, xper, yper);
if (width > 0 && widw) *widw = width;
if (height > 0 && widh) *widh = height;
if(xoff != INT_MIN && xsign[0] == '-') xoff = scrw - *widw - xoff;
if(yoff != INT_MIN && ysign[0] == '-') yoff = scrh - *widh - yoff;
if(xper >= 0 && xper <= 100) xoff = (scrw - *widw) * ((float)xper / 100.0);
@ -89,13 +95,9 @@ int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh)
mp_msg(MSGT_VO, MSGL_V,"geometry set to width: %i,"
"height: %i, xoff: %i, yoff: %i, xper: %i, yper: %i\n",
width, height, xoff, yoff, xper, yper);
mp_msg(MSGT_VO, MSGL_V,"geometry window parameter: widw: %i,"
" widh: %i, scrw: %i, scrh: %i\n",*widw, *widh, scrw, scrh);
if (xoff != INT_MIN && xpos) *xpos = xoff;
if (yoff != INT_MIN && ypos) *ypos = yoff;
if (width > 0 && widw) *widw = width;
if (height > 0 && widh) *widh = height;
geometry_wh_changed = width > 0 || height > 0;
geometry_xy_changed = xoff != INT_MIN || yoff != INT_MIN;