diff options
| author | Dudemanguy <random342@airmail.cc> | 2021-04-29 08:53:58 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2021-04-29 15:37:33 +0000 |
| commit | 029cd8a813eb07cdc3321a2345514c7ab631c92f (patch) | |
| tree | 56044b386022dcfbc690dad6c39f5ef06f0e9b0e | |
| parent | 96b68358e343240eda568b4a8aec2d0bc4212518 (diff) | |
| download | mpv-029cd8a813eb07cdc3321a2345514c7ab631c92f.tar.bz2 mpv-029cd8a813eb07cdc3321a2345514c7ab631c92f.tar.xz | |
command: osd-dimensions: return ints and doc fixes
Some subproperties in osd-dimensions were returned as doubles despite
actually being integers. Additionally, correct a highly misleading line
in the osd-width/osd-height documentation.
| -rw-r--r-- | DOCS/man/input.rst | 4 | ||||
| -rw-r--r-- | player/command.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index 9f77123a6c..cf4bd4c649 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -2544,8 +2544,8 @@ Property list ``osd-width``, ``osd-height`` Last known OSD width (can be 0). This is needed if you want to use the - ``overlay-add`` command. It gives you the actual OSD size, which can be - different from the window size in some cases. + ``overlay-add`` command. It gives you the actual OSD/window size (not + including decorations drawn by the OS window manager). Alias to ``osd-dimensions/w`` and ``osd-dimensions/h``. diff --git a/player/command.c b/player/command.c index e210963447..12a5f75282 100644 --- a/player/command.c +++ b/player/command.c @@ -2587,14 +2587,14 @@ static int mp_property_osd_dim(void *ctx, struct m_property *prop, (vo_res.display_par ? vo_res.display_par : 1); struct m_sub_property props[] = { - {"w", SUB_PROP_DOUBLE(vo_res.w)}, - {"h", SUB_PROP_DOUBLE(vo_res.h)}, + {"w", SUB_PROP_INT(vo_res.w)}, + {"h", SUB_PROP_INT(vo_res.h)}, {"par", SUB_PROP_DOUBLE(vo_res.display_par)}, {"aspect", SUB_PROP_DOUBLE(aspect)}, - {"mt", SUB_PROP_DOUBLE(vo_res.mt)}, - {"mb", SUB_PROP_DOUBLE(vo_res.mb)}, - {"ml", SUB_PROP_DOUBLE(vo_res.ml)}, - {"mr", SUB_PROP_DOUBLE(vo_res.mr)}, + {"mt", SUB_PROP_INT(vo_res.mt)}, + {"mb", SUB_PROP_INT(vo_res.mb)}, + {"ml", SUB_PROP_INT(vo_res.ml)}, + {"mr", SUB_PROP_INT(vo_res.mr)}, {0} }; |