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

m_option: remove unneded compatibility features 

Aliases that set old options are not needed anymore. Also extend the
total size of the aliases array for one of the following commits.
This commit is contained in:
wm4 2018-02-21 12:43:15 +01:00 committed by Kevin Mitchell
parent d6921678b9
commit e76fda8594
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
options/m_option.c
View File

@ -2623,16 +2623,9 @@ bool m_obj_list_find(struct m_obj_desc *dst, const struct m_obj_list *l,
for (int i = 0; l->aliases[i][0]; i++) {
const char *aname = l->aliases[i][0];
const char *alias = l->aliases[i][1];
const char *opts = l->aliases[i][2];
if (bstr_equals0(name, aname) && m_obj_list_find(dst, l, bstr0(alias)))
{
if (opts) {
dst->init_options = opts;
} else {
// Assume it's deprecated in this case.
// Also, it's used by the VO code only, so whatever.
dst->replaced_name = aname;
}
dst->replaced_name = aname;
return true;
}
}

2
options/m_option.h
View File

@ -147,7 +147,7 @@ struct m_obj_list {
bool (*get_desc)(struct m_obj_desc *dst, int index);
const char *description;
// Can be set to a NULL terminated array of aliases
const char *aliases[4][5];
const char *aliases[5][2];
// Allow a trailing ",", which adds an entry with name=""
bool allow_trailer;
// Allow unknown entries, for which a dummy entry is inserted, and whose