summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-02-08 23:52:06 +0100
committerwm4 <wm4@nowhere>2013-02-09 00:21:18 +0100
commita1be0e1aecdd88bbc56b940e00d3bf51b96c0e4c (patch)
treeaa472dd8f39cafcd0b3e38030ee8a945f4b3103d /DOCS
parentc1ddfb59076e9b568484b97f10b4eadeb48384e3 (diff)
downloadmpv-a1be0e1aecdd88bbc56b940e00d3bf51b96c0e4c.tar.bz2
mpv-a1be0e1aecdd88bbc56b940e00d3bf51b96c0e4c.tar.xz
options: change --no-config option, make it apply to input.conf as well
Simplify --no-config and make it a normal flag option, and doesn't take an argument anymore. You can get the same behavior by using --no-config and then --include to explicitly load a certain config file. Make --no-config work for input.conf as well. Make it so that --input:conf=file still works in this case. As a technically unrelated change, the file argument now works as one would expect, instead of making it relatively to "~/.mpv/". This makes for simpler code and easier to understand option semantics. We can also print better error messages.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/options.rst20
1 files changed, 9 insertions, 11 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 8d809c9db8..ea43b9c49f 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -886,8 +886,7 @@
conf=<filename>
Specify input configuration file other than the default
- ``~/.mpv/input.conf``. ``~/.mpv/<filename>`` is assumed if no
- full path is given.
+ ``~/.mpv/input.conf``.
ar-dev=<device>
Device to be used for Apple IR Remote (default is autodetected, Linux
@@ -1251,17 +1250,16 @@
Disables colorkeying. Only supported by the xv (see ``--vo=xv:ck``) video
output driver.
---no-config=<options>
- Do not parse selected configuration files.
+--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.
- *NOTE*: If ``--include`` or ``--use-filedir-conf`` options are specified
- at the command line, they will be honoured.
+ Loading of some configuration files is not affected by this option, such
+ as configuration files for cddb, DVB code and fontconfig.
- Available options are:
-
- :all: all configuration files
- :system: system configuration file
- :user: user configuration file
+ *NOTE*: Files explicitly requested by command line options, like
+ ``--include`` or ``--use-filedir-conf``, will still be loaded.
--no-idx
Do not use index present in the file even if one is present.