diff options
| author | wm4 <wm4@nowhere> | 2013-02-08 23:52:06 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-02-09 00:21:18 +0100 |
| commit | a1be0e1aecdd88bbc56b940e00d3bf51b96c0e4c (patch) | |
| tree | aa472dd8f39cafcd0b3e38030ee8a945f4b3103d /core/input/input.h | |
| parent | c1ddfb59076e9b568484b97f10b4eadeb48384e3 (diff) | |
| download | mpv-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/input/input.h')
| -rw-r--r-- | core/input/input.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/input/input.h b/core/input/input.h index 974ca3d6c4..14d100e152 100644 --- a/core/input/input.h +++ b/core/input/input.h @@ -203,7 +203,8 @@ char *mp_input_get_section(struct input_ctx *ictx); // Initialize the input system struct input_conf; -struct input_ctx *mp_input_init(struct input_conf *input_conf); +struct input_ctx *mp_input_init(struct input_conf *input_conf, + bool load_default_conf); void mp_input_uninit(struct input_ctx *ictx); |