diff options
author | wm4 <wm4@nowhere> | 2012-09-03 22:44:44 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-09-18 21:07:29 +0200 |
commit | d29d4df634a9d847a2b5ef7a04f32726cd03c1ef (patch) | |
tree | 0d9b1f7adcd2bce7f45ea9e0e0bc8a0ce019df9b /cfg-mplayer.h | |
parent | f97a85595bb5117db27fe18ea14986c42c116492 (diff) | |
download | mpv-d29d4df634a9d847a2b5ef7a04f32726cd03c1ef.tar.bz2 mpv-d29d4df634a9d847a2b5ef7a04f32726cd03c1ef.tar.xz |
options: remove M_OPT_IMPLICIT_DEFAULT
This was to make an option without value use the option's default value
(e.g. --term-osd is the same as --term-osd=auto). Make it simpler by
handling this case as an empty choice.
The flag was probably needed when option handling still did ambiguous
argument parsing.
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r-- | cfg-mplayer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 04ae529e1d..d27ee323d3 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -711,9 +711,9 @@ const m_option_t mplayer_opts[]={ OPT_FLAG_ON("softsleep", softsleep, 0), - OPT_CHOICE("term-osd", term_osd, M_OPT_IMPLICIT_DEFAULT, + OPT_CHOICE("term-osd", term_osd, 0, ({"force", 1}, - {"auto", 2}, + {"auto", 2}, {"", 2}, {"off", 0})), OPT_STRING("term-osd-esc", term_osd_esc, 0, OPTDEF_STR("\x1b[A\r\x1b[K")), |