diff options
| author | wm4 <wm4@nowhere> | 2015-02-27 18:31:24 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-27 18:31:24 +0100 |
| commit | 1eb533afb379ac9addb9205bf25e32cdc9442e93 (patch) | |
| tree | e828478551748b858560965838bde4e9162d5b7e /options/m_option.h | |
| parent | b143102f6d0ffe383cca346336bcb745ed029a49 (diff) | |
| download | mpv-1eb533afb379ac9addb9205bf25e32cdc9442e93.tar.bz2 mpv-1eb533afb379ac9addb9205bf25e32cdc9442e93.tar.xz | |
options: handle choice -> flag fallback automatically
In the past it happened quite often that flag options (yes/no) were
changed to choice options (yes/no/some more). The problem with this was
that while flag options don't need a parameter, this wasn't the case
with choice options. A hack was introduced to compensate for this:
setting M_OPT_OPTIONAL_PARAM on the option, and an empty string ("") was
added as choice, so that the choice could be used like a flag. So, for
example, "--mute" would set the choice "".
Fix this by 1. not requiring a parameter if there's a "yes" choice, and
2. redirect an empty parameter to "yes". The effect is that a choice
option with the choices ["yes", "no"] is pretty much equivalent to a
flag option.
Diffstat (limited to 'options/m_option.h')
| -rw-r--r-- | options/m_option.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/options/m_option.h b/options/m_option.h index c05e2d760c..c26d1b3529 100644 --- a/options/m_option.h +++ b/options/m_option.h @@ -358,9 +358,6 @@ struct m_option { // The option should be set during command line pre-parsing #define M_OPT_PRE_PARSE (1 << 6) -// See M_OPT_TYPE_OPTIONAL_PARAM. -#define M_OPT_OPTIONAL_PARAM (1 << 10) - // The option expects a file name (or a list of file names) #define M_OPT_FILE (1 << 11) |