summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-29 19:11:07 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-01-25 17:00:11 +0900
commitfadf87f2a796feb30f89d8dbbc43623b2ce17599 (patch)
treeee08bdc7686e5469a3d207168102b8882b3dfae0
parent62c7a372ec90319d9b60fd9e8b3a39fe9a594a5c (diff)
downloadmpv-fadf87f2a796feb30f89d8dbbc43623b2ce17599.tar.bz2
mpv-fadf87f2a796feb30f89d8dbbc43623b2ce17599.tar.xz
manpage: minor fixes
Also update the Lua example. The "pause" event was declared deprecated, so the example should use the newer API.
-rw-r--r--DOCS/man/lua.rst11
-rw-r--r--DOCS/man/mpv.rst4
-rw-r--r--DOCS/man/options.rst4
3 files changed, 9 insertions, 10 deletions
diff --git a/DOCS/man/lua.rst b/DOCS/man/lua.rst
index 57c1c35e5d..cae764e22e 100644
--- a/DOCS/man/lua.rst
+++ b/DOCS/man/lua.rst
@@ -22,10 +22,12 @@ A script which leaves fullscreen mode when the player is paused:
::
- function on_pause()
- mp.set_property("fullscreen", "no")
+ function on_pause(name, value)
+ if pause == true then
+ mp.set_property("fullscreen", "no")
+ end
end
- mp.register_event("pause", on_pause)
+ mp.observe_property("pause", "bool", on_pause_change)
This script provides a pretty weird feature, but Lua scripting was made to
allow users implement features which are not going to be added to the mpv core.
@@ -720,9 +722,6 @@ List of events
``command-reply``
Undocumented (not useful for Lua scripts).
-``script-input-dispatch``
- Undocumented (used internally).
-
``client-message``
Undocumented (used internally).
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index f66fb70166..cde006574d 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -488,7 +488,7 @@ listed.
- ``AV:`` or ``V:`` (video only) or ``A:`` (audio only)
- The current time position in ``HH:MM:SS`` format (``playback-time`` property)
-- The total file duration (or ``00:00:00`` if unknown) (``length`` property)
+- The total file duration (absent if unknown) (``length`` property)
- Playback speed, e.g. `` x2.0``. Only visible if the speed is not normal. This
is the user-requested speed, and not the actual speed (usually they should
be the same, unless playback is too slow). (``speed`` property.)
@@ -539,7 +539,7 @@ PROTOCOLS
``bd://[title][/device]`` ``--bluray-device=PATH``
Play a Blu-Ray disc. Currently, this does not accept ISO files. Instead,
you must mount the ISO file as filesystem, and point ``--bluray-device``
- to the mounted directly.
+ to the mounted directory directly.
``bdnav://[title][/device]``
Play a Blu-Ray disc, with navigation features enabled. This feature is
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 9a86656b2a..3cd561aa80 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -51,8 +51,8 @@ Track Selection
other software using FFmpeg (consider ``ffprobe``).
Note that with external tracks (added with ``--sub-file`` and similar
- options) will have duplicate IDs. In that case, the first stream in order
- is selected.
+ options), there will be streams with duplicate IDs. In this case, the
+ first stream in order is selected.
``--edition=<ID|auto>``
(Matroska files only)