summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-02-14 23:15:32 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-02-16 22:04:15 -0800
commita2cf846a5cd3b5f876537a92ea2c5e479cac5c77 (patch)
treeb66b5fa88477580e37d7577b1120c670e59cd9d0
parentd969a0a27df2e383efdbd5330745a9bdad25dae3 (diff)
downloadmpv-a2cf846a5cd3b5f876537a92ea2c5e479cac5c77.tar.bz2
mpv-a2cf846a5cd3b5f876537a92ea2c5e479cac5c77.tar.xz
command: simplify mp_property_filter_metadata
Also silence a dead code coverity error.
-rw-r--r--player/command.c30
1 files changed, 11 insertions, 19 deletions
diff --git a/player/command.c b/player/command.c
index e4e5246cc4..af32c924ab 100644
--- a/player/command.c
+++ b/player/command.c
@@ -1428,7 +1428,6 @@ static int mp_property_filter_metadata(void *ctx, struct m_property *prop,
char *rem;
m_property_split_path(ka->key, &key, &rem);
struct mp_tags *metadata = NULL;
- int res = CONTROL_UNKNOWN;
struct mp_output_chain *chain = NULL;
if (strcmp(type, "vf") == 0) {
chain = mpctx->vo_chain ? mpctx->vo_chain->filter : NULL;
@@ -1444,26 +1443,19 @@ static int mp_property_filter_metadata(void *ctx, struct m_property *prop,
};
mp_output_chain_command(chain, mp_tprintf(80, "%.*s", BSTR_P(key)), &cmd);
- if (metadata)
- res = CONTROL_OK;
-
- switch (res) {
- case CONTROL_UNKNOWN:
- return M_PROPERTY_UNKNOWN;
- case CONTROL_NA: // empty
- case CONTROL_OK:
- if (strlen(rem)) {
- struct m_property_action_arg next_ka = *ka;
- next_ka.key = rem;
- res = tag_property(M_PROPERTY_KEY_ACTION, &next_ka, metadata);
- } else {
- res = tag_property(ka->action, ka->arg, metadata);
- }
- talloc_free(metadata);
- return res;
- default:
+ if (!metadata)
return M_PROPERTY_ERROR;
+
+ int res;
+ if (strlen(rem)) {
+ struct m_property_action_arg next_ka = *ka;
+ next_ka.key = rem;
+ res = tag_property(M_PROPERTY_KEY_ACTION, &next_ka, metadata);
+ } else {
+ res = tag_property(ka->action, ka->arg, metadata);
}
+ talloc_free(metadata);
+ return res;
}
return M_PROPERTY_NOT_IMPLEMENTED;
}