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/defaultopts.c | |
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/defaultopts.c')
-rw-r--r-- | core/defaultopts.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/defaultopts.c b/core/defaultopts.c index d0205cb3d3..36407cc71d 100644 --- a/core/defaultopts.c +++ b/core/defaultopts.c @@ -31,6 +31,7 @@ void set_default_mplayer_options(struct MPOpts *opts) .loop_times = -1, .ordered_chapters = 1, .chapter_merge_threshold = 100, + .load_config = 1, .stream_cache_min_percent = 20.0, .stream_cache_seek_min_percent = 50.0, .stream_cache_pause = 10.0, |