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

m_option: remove leftovers of del action 

b56e63e2a9 removed -del for list options but it is still listed in the
list structs, which means that it is still tab completed on the CLI like
the other actions, and seems to behave like -set. Remove it so it is no
longer tab completed.

Also remove the description of -del from the help output of object
settings lists --(ao|vo|af|vf)-help, and update a comment.
This commit is contained in:
Guido Cella 2023-11-12 19:08:43 +01:00 committed by Dudemanguy
parent ca6ae6fb5f
commit 8b3075c9be
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
options/m_option.c
View File

@ -1604,7 +1604,6 @@ const m_option_type_t m_option_type_string_list = {
{"add"},
{"append"},
{"clr", M_OPT_TYPE_OPTIONAL_PARAM},
{"del"},
{"pre"},
{"set"},
{"toggle"},
@ -3277,7 +3276,7 @@ done: ;
return 1;
}
// Parse a single entry for -vf-del (return 0 if not applicable)
// Parse a single entry for -vf-remove (return 0 if not applicable)
// mark_del is bounded by the number of items in dst
static int parse_obj_settings_del(struct mp_log *log, struct bstr opt_name,
struct bstr *param, void *dst, bool *mark_del)
@ -3345,16 +3344,12 @@ static int parse_obj_settings_list(struct mp_log *log, const m_option_t *opt,
" Prepend the given list to the current list\n\n"
" %s-remove\n"
" Remove the given filter from the current list\n\n"
" %s-del x,y,...\n"
" Remove the given elements. Take the list element index (starting from 0).\n"
" Negative index can be used (i.e. -1 is the last element).\n"
" Filter names work as well.\n\n"
" %s-toggle\n"
" Add the filter to the list, or remove it if it's already added.\n\n"
" %s-clr\n"
" Clear the current list.\n\n",
opt->name, opt->name, opt->name, opt->name, opt->name,
opt->name, opt->name, opt->name, opt->name);
opt->name, opt->name, opt->name);
return M_OPT_EXIT;
}
@ -3700,7 +3695,6 @@ const m_option_type_t m_option_type_obj_settings_list = {
{"add"},
{"append"},
{"clr", M_OPT_TYPE_OPTIONAL_PARAM},
{"del"},
{"help", M_OPT_TYPE_OPTIONAL_PARAM},
{"pre"},
{"set"},