summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-16 12:32:34 +0200
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-05-19 11:11:46 +0900
commit679de2b295dea63d1a6feb70d599673112eb4e1e (patch)
tree2ce6c078dec342c152affb20cb95c9af41735ba5
parent8f9cb82f4f85ac3e95bc20d35340ea06c69409f1 (diff)
downloadmpv-679de2b295dea63d1a6feb70d599673112eb4e1e.tar.bz2
mpv-679de2b295dea63d1a6feb70d599673112eb4e1e.tar.xz
manpage: lua: clarify OSD differences between mp.command/mp.commandv
Conflicts: player/audio.c player/video.c (cherry picked from commit f9ff4b59a266cfbbcf7dc633b2c31cf97c67abc4)
-rw-r--r--DOCS/man/lua.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/DOCS/man/lua.rst b/DOCS/man/lua.rst
index ff70600a1d..d5c9b31808 100644
--- a/DOCS/man/lua.rst
+++ b/DOCS/man/lua.rst
@@ -73,6 +73,10 @@ The ``mp`` module is preloaded, although it can be loaded manually with
Run the given command. This is similar to the commands used in input.conf.
See `List of Input Commands`_.
+ By default, this will show something on the OSD (depending on the command),
+ as if it was used in ``input.conf``. See `Input Command Prefixes`_ how
+ to influence OSD usage per command.
+
Returns ``true`` on success, or ``nil, error`` on error.
``mp.commandv(arg1, arg2, ...)``
@@ -94,6 +98,9 @@ The ``mp`` module is preloaded, although it can be loaded manually with
the ``expand-properties`` prefix, or the ``mp.get_property`` family of
functions.
+ Unlike ``mp.command``, this will not use OSD by default either (except
+ for some OSd-specific commands).
+
``mp.command_native(table [,def])``
Similar to ``mp.commandv``, but pass the argument list as table. This has
the advantage that in at least some cases, arguments can be passed as