diff options
| author | wm4 <wm4@nowhere> | 2014-09-04 22:53:50 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-09-05 01:52:16 +0200 |
| commit | e267ff93f32783e324c93395ab135e5b26f0efe1 (patch) | |
| tree | 8a73106d88850bb466f85f9cc36ba5f158c4111f /player/command.c | |
| parent | c15957b43a715563d405f42ec38c6c0ed1d477f9 (diff) | |
| download | mpv-e267ff93f32783e324c93395ab135e5b26f0efe1.tar.bz2 mpv-e267ff93f32783e324c93395ab135e5b26f0efe1.tar.xz | |
video: rename VOCTRL_GET_WINDOW_SIZE
Make it clear that this accesses the un-fullscreened window size.
Diffstat (limited to 'player/command.c')
| -rw-r--r-- | player/command.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/player/command.c b/player/command.c index 3e5849fe80..4879115d86 100644 --- a/player/command.c +++ b/player/command.c @@ -2169,13 +2169,15 @@ static int mp_property_window_scale(void *ctx, struct m_property *prop, case M_PROPERTY_SET: { double scale = *(double *)arg; int s[2] = {vid_w * scale, vid_h * scale}; - if (s[0] > 0 && s[1] > 0 && vo_control(vo, VOCTRL_SET_WINDOW_SIZE, s) > 0) + if (s[0] > 0 && s[1] > 0 && + vo_control(vo, VOCTRL_SET_UNFS_WINDOW_SIZE, s) > 0) return M_PROPERTY_OK; return M_PROPERTY_UNAVAILABLE; } case M_PROPERTY_GET: { int s[2]; - if (vo_control(vo, VOCTRL_GET_WINDOW_SIZE, s) <= 0 || s[0] < 1 || s[1] < 1) + if (vo_control(vo, VOCTRL_GET_UNFS_WINDOW_SIZE, s) <= 0 || + s[0] < 1 || s[1] < 1) return M_PROPERTY_UNAVAILABLE; double xs = (double)s[0] / vid_w; double ys = (double)s[1] / vid_h; |