summaryrefslogtreecommitdiffstats
path: root/core/cfg-mplayer.h
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 /core/cfg-mplayer.h
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 'core/cfg-mplayer.h')
-rw-r--r--core/cfg-mplayer.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h
index 92f7d87906..78d85aa9ed 100644
--- a/core/cfg-mplayer.h
+++ b/core/cfg-mplayer.h
@@ -297,8 +297,7 @@ const m_option_t common_opts[] = {
#ifdef CONFIG_PRIORITY
{"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL},
#endif
- OPT_CHOICE("no-config", noconfig, CONF_GLOBAL | CONF_NOCFG | CONF_PRE_PARSE,
- ({"no", 0}, {"user", 1}, {"system", 2}, {"all", 3})),
+ OPT_FLAG("config", load_config, CONF_GLOBAL | CONF_NOCFG | CONF_PRE_PARSE),
// ------------------------- stream options --------------------