diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2012-07-27 03:25:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2012-07-27 03:34:17 +0300 |
| commit | adfa7bdfb2c61b136b2d15dcae516c0394b2e86b (patch) | |
| tree | b791c3693c412ef9557f85e25f15de40d162f174 | |
| parent | 4d71fb7098f2b1488e514f09298edf764bb0d75b (diff) | |
| download | mpv-adfa7bdfb2c61b136b2d15dcae516c0394b2e86b.tar.bz2 mpv-adfa7bdfb2c61b136b2d15dcae516c0394b2e86b.tar.xz | |
options: support "no-foo" syntax for flag suboptions
Allow using "no-foo" as an alternative to "foo=no" for flag
suboptions, similarly to what top-level flag options already support.
This means things like "--lavdopts=no-fast" or
"--vo=vdpau:no-chroma-deint" are now supported.
| -rw-r--r-- | m_config.c | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/m_config.c b/m_config.c index 7545cdb4eb..fb9e1b6492 100644 --- a/m_config.c +++ b/m_config.c @@ -510,15 +510,32 @@ static int parse_subopts(struct m_config *config, void *optstruct, char *name, char n[110]; if (snprintf(n, 110, "%s%s", prefix, lst[2 * i]) > 100) abort(); - int sr = m_config_parse_option(config, optstruct, bstr(n), - bstr(lst[2 * i + 1]), false, set); - if (sr < 0) { - if (sr == M_OPT_UNKNOWN) { + if (!m_config_get_option(config, bstr(n))) { + if (strncmp(lst[2 * i], "no-", 3)) + goto nosubopt; + snprintf(n, 110, "%s%s", prefix, lst[2 * i] + 3); + const struct m_option *o = m_config_get_option(config, bstr(n)); + if (!o || o->type != &m_option_type_flag) { + nosubopt: mp_tmsg(MSGT_CFGPARSER, MSGL_ERR, "Error: option '%s' has no suboption '%s'.\n", name, lst[2 * i]); r = M_OPT_INVALID; - } else if (sr == M_OPT_MISSING_PARAM) { + break; + } + if (lst[2 * i + 1]) { + mp_tmsg(MSGT_CFGPARSER, MSGL_ERR, + "A --no-* option can't take parameters: " + "%s=%s\n", lst[2 * i], lst[2 * i + 1]); + r = M_OPT_INVALID; + break; + } + lst[2 * i + 1] = "no"; + } + int sr = m_config_parse_option(config, optstruct, bstr(n), + bstr(lst[2 * i + 1]), false, set); + if (sr < 0) { + if (sr == M_OPT_MISSING_PARAM) { mp_tmsg(MSGT_CFGPARSER, MSGL_ERR, "Error: suboption '%s' of '%s' must have " "a parameter!\n", lst[2 * i], name); @@ -571,7 +588,7 @@ const struct m_option *m_config_get_option(const struct m_config *config, struct m_config_option *co; assert(config != NULL); - assert(config->lvl > 0); + assert(config->lvl > 0 || !config->full); co = m_config_get_co(config, name); if (co) |