summaryrefslogtreecommitdiffstats
path: root/options/m_property.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-02-24 20:03:45 +0100
committerwm4 <wm4@nowhere>2014-02-24 20:51:05 +0100
commitb097d76281151ca6013f84e3585c038b9c04fb82 (patch)
tree977e4a70b59c61f6f6b43ee99b4e6205b93f47a6 /options/m_property.c
parent43ad09393cef89fd4ad4795ef98397f04597bfc9 (diff)
downloadmpv-b097d76281151ca6013f84e3585c038b9c04fb82.tar.bz2
mpv-b097d76281151ca6013f84e3585c038b9c04fb82.tar.xz
m_property: simplify some code
Diffstat (limited to 'options/m_property.c')
-rw-r--r--options/m_property.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/options/m_property.c b/options/m_property.c
index 225296db89..9ac5ab43bd 100644
--- a/options/m_property.c
+++ b/options/m_property.c
@@ -183,16 +183,12 @@ int m_property_do(struct mp_log *log, const m_option_t *prop_list,
case M_PROPERTY_SET: {
if (!log)
return M_PROPERTY_ERROR;
- if (!opt.type->clamp) {
- mp_warn(log, "Property '%s' without clamp().\n", name);
- } else {
- m_option_copy(&opt, &val, arg);
- r = opt.type->clamp(&opt, arg);
- m_option_free(&opt, &val);
- if (r != 0) {
- mp_err(log, "Property '%s': invalid value.\n", name);
- return M_PROPERTY_ERROR;
- }
+ m_option_copy(&opt, &val, arg);
+ r = opt.type->clamp ? opt.type->clamp(&opt, arg) : 0;
+ m_option_free(&opt, &val);
+ 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);
}