RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

options: don't report errors on help value for OPT_CHOICE 

'help' is a valid value for a lot of mpv options, such as `hwdec`
or `vo` for printing available values, so this change makes the
output of OPT_CHOICE options like `--video-sync=help` more
consistent by not reporting an error about invalid value 'help'.
This commit is contained in:
pavelxdd 2017-12-08 17:58:41 +03:00 committed by Jan Ekström
parent 0a749a38f7
commit 3723e611fc
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
options/m_option.c
View File

@ -441,6 +441,15 @@ const char *m_opt_choice_str(const struct m_opt_choice_alternatives *choices,
return NULL;
}
static void print_choice_values(struct mp_log *log, const struct m_option *opt)
{
struct m_opt_choice_alternatives *alt = opt->priv;
for ( ; alt->name; alt++)
mp_info(log, " %s\n", alt->name[0] ? alt->name : "(passing nothing)");
if ((opt->flags & M_OPT_MIN) && (opt->flags & M_OPT_MAX))
mp_info(log, " %g-%g (integer range)\n", opt->min, opt->max);
}
static int parse_choice(struct mp_log *log, const struct m_option *opt,
struct bstr name, struct bstr param, void *dst)
{
@ -457,6 +466,11 @@ static int parse_choice(struct mp_log *log, const struct m_option *opt,
}
}
if (!alt->name) {
if (!bstrcmp0(param, "help")) {
mp_info(log, "Valid values for option %.*s are:\n", BSTR_P(name));
print_choice_values(log, opt);
return M_OPT_EXIT;
}
if (param.len == 0)
return M_OPT_MISSING_PARAM;
if ((opt->flags & M_OPT_MIN) && (opt->flags & M_OPT_MAX)) {
@ -470,10 +484,7 @@ static int parse_choice(struct mp_log *log, const struct m_option *opt,
mp_fatal(log, "Invalid value for option %.*s: %.*s\n",
BSTR_P(name), BSTR_P(param));
mp_info(log, "Valid values are:\n");
for (alt = opt->priv; alt->name; alt++)
mp_info(log, " %s\n", alt->name[0] ? alt->name : "(passing nothing)");
if ((opt->flags & M_OPT_MIN) && (opt->flags & M_OPT_MAX))
mp_info(log, " %g-%g (integer range)\n", opt->min, opt->max);
print_choice_values(log, opt);
return M_OPT_INVALID;
}
if (dst)