RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-17 04:58:06 +00:00
Code Issues Releases Wiki Activity

m_property: simplify some code

Browse Source
This commit is contained in:
wm4 2014-02-24 20:03:45 +01:00
parent 43ad09393c
commit b097d76281
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
options/m_property.c
View File

@ -183,16 +183,12 @@ int m_property_do(struct mp_log *log, const m_option_t *prop_list,
case M_PROPERTY_SET: { case M_PROPERTY_SET: {
if (!log) if (!log)
return M_PROPERTY_ERROR; return M_PROPERTY_ERROR;
if (!opt.type->clamp) { m_option_copy(&opt, &val, arg);
mp_warn(log, "Property '%s' without clamp().\n", name); r = opt.type->clamp ? opt.type->clamp(&opt, arg) : 0;
} else { m_option_free(&opt, &val);
m_option_copy(&opt, &val, arg); if (r != 0) {
r = opt.type->clamp(&opt, arg); mp_err(log, "Property '%s': invalid value.\n", name);
m_option_free(&opt, &val); return M_PROPERTY_ERROR;
if (r != 0) {
mp_err(log, "Property '%s': invalid value.\n", name);
return M_PROPERTY_ERROR;
}
} }
return do_action(prop_list, name, M_PROPERTY_SET, arg, ctx); return do_action(prop_list, name, M_PROPERTY_SET, arg, ctx);
} }