mirror of
https://github.com/mpv-player/mpv
synced 2024-12-24 15:52:25 +00:00
backport PRINT_INDIRECT to old-config parser (new config fails on some 64bit systems - should be fixed) and some minor corrections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10321 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
b6a67e5378
commit
7c94cd567a
@ -72,6 +72,7 @@ m_config_save_option(m_config_t* config, config_t* conf,char* opt, char *param)
|
|||||||
|
|
||||||
switch(conf->type) {
|
switch(conf->type) {
|
||||||
case CONF_TYPE_PRINT :
|
case CONF_TYPE_PRINT :
|
||||||
|
case CONF_TYPE_PRINT_INDIRECT :
|
||||||
case CONF_TYPE_SUBCONFIG :
|
case CONF_TYPE_SUBCONFIG :
|
||||||
return;
|
return;
|
||||||
default :
|
default :
|
||||||
@ -761,6 +762,9 @@ static int config_read_option(m_config_t *config,config_t** conf_list, char *opt
|
|||||||
case CONF_TYPE_PRINT:
|
case CONF_TYPE_PRINT:
|
||||||
mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", (char *) conf[i].p);
|
mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", (char *) conf[i].p);
|
||||||
exit(1);
|
exit(1);
|
||||||
|
case CONF_TYPE_PRINT_INDIRECT:
|
||||||
|
mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", *(char **) conf[i].p);
|
||||||
|
exit(1);
|
||||||
case CONF_TYPE_POSITION:
|
case CONF_TYPE_POSITION:
|
||||||
if (param == NULL)
|
if (param == NULL)
|
||||||
goto err_missing_param;
|
goto err_missing_param;
|
||||||
@ -1490,6 +1494,7 @@ static void m_config_print_option_list(char* prefix, config_t* opt_list) {
|
|||||||
type = "Function";
|
type = "Function";
|
||||||
break;
|
break;
|
||||||
case CONF_TYPE_PRINT:
|
case CONF_TYPE_PRINT:
|
||||||
|
case CONF_TYPE_PRINT_INDIRECT:
|
||||||
type = "Print";
|
type = "Print";
|
||||||
break;
|
break;
|
||||||
case CONF_TYPE_STRING_LIST:
|
case CONF_TYPE_STRING_LIST:
|
||||||
|
Loading…
Reference in New Issue
Block a user