diff options
| author | wm4 <wm4@nowhere> | 2013-01-23 10:56:11 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-01-23 10:56:11 +0100 |
| commit | 4c56baba4048f8a881253d4fe2f49c2715c77376 (patch) | |
| tree | d75891df8cd30c404072f9b67b6da21188b79ba8 /video/out/vo.c | |
| parent | f2dcdca0c2dc5f904323659b65b29a2b6f00fd88 (diff) | |
| download | mpv-4c56baba4048f8a881253d4fe2f49c2715c77376.tar.bz2 mpv-4c56baba4048f8a881253d4fe2f49c2715c77376.tar.xz | |
options: move -geometry parsing to m_option.c
This also means the option is verified on program start, not when the VO
is created. The actual code becomes a bit more complex, because the
screen width/height is not available at program start.
The actual parsing code is still the same, with its unusual sscanf()
usage.
Diffstat (limited to 'video/out/vo.c')
| -rw-r--r-- | video/out/vo.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/video/out/vo.c b/video/out/vo.c index 9163367eb9..29307b7218 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -33,7 +33,6 @@ #include "core/bstr.h" #include "vo.h" #include "aspect.h" -#include "geometry.h" #include "core/input/input.h" #include "core/mp_fifo.h" #include "core/m_config.h" @@ -403,9 +402,9 @@ static void determine_window_geometry(struct vo *vo, int d_w, int d_h) vo->dx = (int)(opts->vo_screenwidth - d_w) / 2; vo->dy = (int)(opts->vo_screenheight - d_h) / 2; - geometry(&vo->dx, &vo->dy, &d_w, &d_h, - opts->vo_screenwidth, opts->vo_screenheight); - geometry_xy_changed |= xinerama_screen >= 0; + m_geometry_apply(&vo->dx, &vo->dy, &d_w, &d_h, + opts->vo_screenwidth, opts->vo_screenheight, + &opts->vo_geometry); vo->dx += xinerama_x; vo->dy += xinerama_y; |