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

Small fix with object list (-vf) help.

Browse Source 
Tell the user when an object have no option description instead of
falling back to the "normal" help, like with -vf pp=help.
Don't display a useless error message when querying the help of
an object option (as in -vf scale=presize=help).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17875 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
albeu 2006-03-15 17:16:13 +00:00
parent 55d26da094
commit 122744d6ed
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
m_option.c
View File

@ -1211,6 +1211,7 @@ static int get_obj_param(char* opt_name,char* obj_name, m_struct_t* desc,
} }
r = m_option_parse(opt,str,p,NULL,M_CONFIG_FILE); r = m_option_parse(opt,str,p,NULL,M_CONFIG_FILE);
if(r < 0) { if(r < 0) {
if(r > M_OPT_EXIT)
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while parsing %s parameter %s (%s)\n",opt_name,obj_name,str,p); mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while parsing %s parameter %s (%s)\n",opt_name,obj_name,str,p);
eq[0] = '='; eq[0] = '=';
return r; return r;
@ -1229,6 +1230,7 @@ static int get_obj_param(char* opt_name,char* obj_name, m_struct_t* desc,
opt = &desc->fields[(*nold)]; opt = &desc->fields[(*nold)];
r = m_option_parse(opt,opt->name,str,NULL,M_CONFIG_FILE); r = m_option_parse(opt,opt->name,str,NULL,M_CONFIG_FILE);
if(r < 0) { if(r < 0) {
if(r > M_OPT_EXIT)
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while parsing %s parameter %s (%s)\n",opt_name,obj_name,opt->name,str); mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while parsing %s parameter %s (%s)\n",opt_name,obj_name,opt->name,str);
return r; return r;
} }
@ -1424,6 +1426,10 @@ static int parse_obj_settings(char* opt,char* str,m_obj_list_t* list,
if(param) { if(param) {
if(!desc && _ret) { if(!desc && _ret) {
if(!strcmp(param,"help")) {
mp_msg(MSGT_CFGPARSER, MSGL_INFO, "Option %s: %s have no option description.\n",opt,str);
return M_OPT_EXIT - 1;
}
plist = calloc(4,sizeof(char*)); plist = calloc(4,sizeof(char*));
plist[0] = strdup("_oldargs_"); plist[0] = strdup("_oldargs_");
plist[1] = strdup(param); plist[1] = strdup(param);