RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-08 10:32:51 +00:00
Code Issues Releases Wiki Activity

m_config: make option setting always call m_config_set_option_raw()

Browse Source 
This makes m_config_set_option_raw() the function that is always called
on the lowest level (as leaf function for all other functions).

To do this, m_config_parse_option() has to do something special to deal
with "impure" options like --vf-add, which work on the previous option
value, instead of fully replacing it. m_config_set_option_raw() itself
always completely replaced the previous value.
This commit is contained in:
wm4 2016-09-17 17:47:22 +02:00
parent 7fa26bfd9c
commit d1d5e9dda4
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
options/m_config.c
View File

@ -373,7 +373,8 @@ void m_config_restore_backups(struct m_config *config)
struct m_opt_backup *bc = config->backup_opts; struct m_opt_backup *bc = config->backup_opts;
config->backup_opts = bc->next; config->backup_opts = bc->next;
m_option_copy(bc->co->opt, bc->co->data, bc->backup); m_config_set_option_raw(config, bc->co, bc->backup, 0);
m_option_free(bc->co->opt, bc->backup); m_option_free(bc->co->opt, bc->backup);
bc->co->is_set_locally = false; bc->co->is_set_locally = false;
talloc_free(bc); talloc_free(bc);
@ -675,15 +676,6 @@ static int handle_set_opt_flags(struct m_config *config,
return set ? 2 : 1; return set ? 2 : 1;
} }
static void handle_on_set(struct m_config *config, struct m_config_option *co,
int flags)
{
if (flags & M_SETOPT_FROM_CMDLINE)
co->is_set_from_cmdline = true;
m_config_notify_change_co(config, co);
}
// The type data points to is as in: co->opt // The type data points to is as in: co->opt
int m_config_set_option_raw(struct m_config *config, struct m_config_option *co, int m_config_set_option_raw(struct m_config *config, struct m_config_option *co,
void *data, int flags) void *data, int flags)
@ -701,7 +693,12 @@ int m_config_set_option_raw(struct m_config *config, struct m_config_option *co,
return r; return r;
m_option_copy(co->opt, co->data, data); m_option_copy(co->opt, co->data, data);
handle_on_set(config, co, flags);
if (flags & M_SETOPT_FROM_CMDLINE)
co->is_set_from_cmdline = true;
m_config_notify_change_co(config, co);
return 0; return 0;
} }
@ -784,10 +781,19 @@ static int m_config_parse_option(struct m_config *config, struct bstr name,
return parse_subopts(config, (char *)co->name, prefix, param, flags); return parse_subopts(config, (char *)co->name, prefix, param, flags);
} }
r = m_option_parse(config->log, co->opt, name, param, set ? co->data : NULL); union m_option_value val = {0};
if (r >= 0 && set) // Some option tpyes are "impure" and work on the existing data.
handle_on_set(config, co, flags); // (Prime examples: --vf-add, --sub-file)
if (co->data)
m_option_copy(co->opt, &val, co->data);
r = m_option_parse(config->log, co->opt, name, param, &val);
if (r >= 0)
r = m_config_set_option_raw(config, co, &val, flags);
m_option_free(co->opt, &val);
return r; return r;
} }