mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

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

Browse Source 
The same idea as in 3723e61 but for OPT_COLOR now.
Added missing closing bracket in the help message.
This commit is contained in:
pavelxdd 2017-12-11 21:40:43 +03:00 committed by Jan Ekström
parent 3f127448e8
commit cdb6cb55e0
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
options/m_option.c
View File

@ -1746,6 +1746,10 @@ static int parse_color(struct mp_log *log, const m_option_t *opt,
if (param.len == 0)
return M_OPT_MISSING_PARAM;
bool is_help = bstr_equals0(param, "help");
if (is_help)
goto error;
bstr val = param;
struct m_color color = {0};
@ -1790,12 +1794,14 @@ static int parse_color(struct mp_log *log, const m_option_t *opt,
return 1;
error:
mp_err(log, "Option %.*s: invalid color: '%.*s'\n",
BSTR_P(name), BSTR_P(param));
mp_err(log, "Valid colors must be in the form #RRGGBB or #AARRGGBB (in hex)\n"
"Or in the form 'r/g/b/a', where each component is a value in the\n"
"range 0.0-1.0. (Also allowed: 'gray', 'gray/a', 'r/g/b'.\n");
return M_OPT_INVALID;
if (!is_help) {
mp_err(log, "Option %.*s: invalid color: '%.*s'\n",
BSTR_P(name), BSTR_P(param));
}
mp_info(log, "Valid colors must be in the form #RRGGBB or #AARRGGBB (in hex)\n"
"or in the form 'r/g/b/a', where each component is a value in the\n"
"range 0.0-1.0. (Also allowed: 'gray', 'gray/a', 'r/g/b').\n");
return is_help ? M_OPT_EXIT : M_OPT_INVALID;
}
const m_option_type_t m_option_type_color = {