Mercurial > mplayer.hg
changeset 30781:1b4d24af52a7
Save the new width and height earlier so that e.g. -geometry 30x30-50-50
gives the correct behaviour - before placement would depend on the
original movie size instead of the one scaled according to -geometry.
| author | reimar |
|---|---|
| date | Wed, 03 Mar 2010 21:01:57 +0000 |
| parents | 0ab92d0c1901 |
| children | 1c38d10731ab |
| files | libvo/geometry.c |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/geometry.c Wed Mar 03 20:57:56 2010 +0000 +++ b/libvo/geometry.c Wed Mar 03 21:01:57 2010 +0000 @@ -77,10 +77,16 @@ 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 @@ 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;