From 5c49fe97cba11bf6cd58b6e18577dbf8095a5222 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 4 Mar 2015 17:21:02 +0100 Subject: input: use flag option type for some input commands This gets rid of the need for a second (or more) parameters; instead it can be all in one parameter. The (now) redundant parameter is still parsed for compatibility, though. The way the flags make each other conflict is a bit tricky: they have overlapping bits, and the option parser disallows setting already set bits. --- DOCS/man/input.rst | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'DOCS/man/input.rst') diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index 8a6ac915ba..badf5ed08a 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -86,11 +86,11 @@ List of Input Commands disabling default bindings, without disabling all bindings with ``--no-input-default-bindings``. -``seek [relative|absolute|absolute-percent|- [default-precise|exact|keyframes]]`` +``seek [relative|absolute|absolute-percent|exact|keyframes]`` Change the playback position. By default, seeks by a relative amount of seconds. - The second argument sets the seek mode: + The second argument consists of flags controlling the seek mode: relative (default) Seek relative to current position (a negative value seeks backwards). @@ -98,16 +98,19 @@ List of Input Commands Seek to a given time. absolute-percent Seek to a given percent position. - - The third argument defines how exact the seek is: - - default-precise (default) - Follow the default behavior as set by ``--hr-seek``, which by default - does imprecise seeks (like ``keyframes``). - exact - Always do exact/hr/precise seeks (slow). keyframes Always restart playback at keyframe boundaries (fast). + exact + Always do exact/hr/precise seeks (slow). + + Multiple flags can be combined, e.g.: ``absolute+keyframes``. + + By default, ``keyframes`` is used for relative seeks, and ``exact`` is used + for absolute seeks. + + Before mpv 0.9, the ``keyframes`` and ``exact`` flags had to be passed as + 3rd parameter (essentially using a space instead of ``+``). The 3rd + parameter is still parsed, but is considered deprecated. ``revert_seek [mode]`` Undoes the ``seek`` command, and some other commands that seek (but not @@ -170,16 +173,12 @@ List of Input Commands Save the contents of the mpv window. Typically scaled, with OSD and subtitles. The exact behavior depends on the selected video output, and if no support is available, this will act like ``video``. - - Second argument: - - (default) - Take a single screenshot. Take a screenshot each frame. Issue this command again to stop taking screenshots. Note that you should disable frame-dropping when using this mode - or you might receive duplicate images in cases when a - frame was dropped. + frame was dropped. This flag can be combined with the other flags, + e.h. ``video+each-frame``. ``screenshot_to_file "" [subtitles|video|window]`` Take a screenshot and save it to a given file. The format of the file will -- cgit v1.2.3