diff options
| author | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2014-02-15 19:44:58 -0300 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2014-02-15 19:44:58 -0300 |
| commit | 317a02bdd43ee4d650e4faea340c610fdfa82ff5 (patch) | |
| tree | 97713668edc7117395f6a5a25e0c554786898b11 /DOCS/man/en | |
| parent | 4a66fce7d336e96847acf5f54e7c0aa30f31ff3b (diff) | |
| parent | 792c1750ecb7af83b52feaee387728d48772b34b (diff) | |
| download | mpv-317a02bdd43ee4d650e4faea340c610fdfa82ff5.tar.bz2 mpv-317a02bdd43ee4d650e4faea340c610fdfa82ff5.tar.xz | |
Merge branch 'master' of git://github.com/mpv-player/mpv
* 'master' of git://github.com/mpv-player/mpv:
win32: restore support for exe directory as config directory
crosscompile-mingw: improve instructions for MXE
sd_lavc: handle subtitles with no subtitle resolution set
options: make --no-config block all auto-loaded configuration files
lua: auto-load scripts from ~/.mpv/lua/
lua: make register_event() not overwrite previous event handler
Diffstat (limited to 'DOCS/man/en')
| -rw-r--r-- | DOCS/man/en/lua.rst | 4 | ||||
| -rw-r--r-- | DOCS/man/en/mpv.rst | 5 | ||||
| -rw-r--r-- | DOCS/man/en/options.rst | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/DOCS/man/en/lua.rst b/DOCS/man/en/lua.rst index 02e7ca8ea9..54b05d9ea5 100644 --- a/DOCS/man/en/lua.rst +++ b/DOCS/man/en/lua.rst @@ -100,6 +100,10 @@ The ``mp`` module is preloaded, although it can be loaded manually with associated, the ``error`` field is set to a string describing the error, on success it's not set. + If multiple functions are registered for the same event, they are run in + registration order, which the first registered function running before all + the other ones. + Returns true if such an event exists, false otherwise. See `Events`_ and `List of events`_ for details. diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst index 4109fdabe4..21ef068e0e 100644 --- a/DOCS/man/en/mpv.rst +++ b/DOCS/man/en/mpv.rst @@ -603,6 +603,11 @@ FILES ``~/.mpv/input.conf`` input bindings (see ``--input-keylist`` for the full list) +``~/.mpv/lua/`` + All files in this directly are loaded as if they were passed to the + ``--lua`` option. They are loaded in alphabetical order, and sub-directories + and files with no ``.lua`` extension are ignored. + EXAMPLES OF MPV USAGE ===================== diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index ce3b730387..da67544d3f 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1412,10 +1412,8 @@ OPTIONS ``--no-config`` Do not load default configuration files. This prevents loading of ``~/.mpv/config`` and ``~/.mpv/input.conf``, as well as loading the - same files from system wide configuration directories. - - Loading of some configuration files is not affected by this option, such - as configuration files for DVB code and fontconfig. + same files from system wide configuration directories. Other configuration + files are blocked as well, such as resume playback files. .. note:: |