mirror of
https://github.com/mpv-player/mpv
synced 2024-12-24 07:42:17 +00:00
do aspect correction of video size before calculating vo_dx and vo_dy.
fixes misplaced video e.g. with -aspect 0.3 (window is not centered but near left border) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18510 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
6fd578b711
commit
ae2eafeb55
@ -134,6 +134,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
|
||||
|
||||
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,
|
||||
@ -171,8 +172,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
|
||||
|
||||
inited = 1;
|
||||
|
||||
aspect(&d_width, &d_height, A_NOZOOM);
|
||||
|
||||
#ifdef HAVE_NEW_GUI
|
||||
if (use_gui)
|
||||
guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window
|
||||
|
@ -191,6 +191,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
|
||||
visible_buf = -1;
|
||||
|
||||
update_xinerama_info();
|
||||
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,
|
||||
@ -234,7 +235,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
|
||||
{
|
||||
hint.x = vo_dx;
|
||||
hint.y = vo_dy;
|
||||
aspect(&d_width, &d_height, A_NOZOOM);
|
||||
hint.width = d_width;
|
||||
hint.height = d_height;
|
||||
#ifdef HAVE_XF86VM
|
||||
|
@ -605,6 +605,7 @@ found_subpic:
|
||||
vo_mouse_autohide = 1;
|
||||
|
||||
update_xinerama_info();
|
||||
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;
|
||||
@ -623,7 +624,6 @@ found_subpic:
|
||||
{
|
||||
hint.x = vo_dx;
|
||||
hint.y = vo_dy;
|
||||
aspect(&d_width,&d_height,A_NOZOOM);
|
||||
hint.width = d_width;
|
||||
hint.height = d_height;
|
||||
#ifdef HAVE_XF86VM
|
||||
|
Loading…
Reference in New Issue
Block a user