RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

command: remove another unneeded hack 

Now that the option-to-property bridge is gone, this is not needed
anymore. It always took the "silent" path.

Also, at least as of before this commit, this didn't correctly print a
warning when accessing a deprecated option as property. This was because
m_config_get_co_raw() was used, which intentionally does not print any
warnings, so switch to the non-raw one. (Affects only options that have
.deprecation_message set.)
This commit is contained in:
wm4 2019-11-30 00:50:31 +01:00
parent 90df6c79c9
commit 56b06907a6
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
player/command.c
View File

@ -104,8 +104,6 @@ struct command_ctx {
char *cur_ipc;
char *cur_ipc_input;
int silence_option_deprecations;
struct mp_cmd_ctx *cache_dump_cmd; // in progress cache dumping
};
@ -379,14 +377,8 @@ static int mp_property_generic_option(void *ctx, struct m_property *prop,
int action, void *arg)
{
MPContext *mpctx = ctx;
const char *optname = prop->name;
struct m_config_option *opt;
if (mpctx->command_ctx->silence_option_deprecations) {
// This case is specifically for making --reset-on-next-file=all silent.
opt = m_config_get_co_raw(mpctx->mconfig, bstr0(optname));
} else {
opt = m_config_get_co(mpctx->mconfig, bstr0(optname));
}
struct m_config_option *opt =
m_config_get_co(mpctx->mconfig, bstr0(prop->name));
if (!opt)
return M_PROPERTY_UNKNOWN;
@ -3543,9 +3535,7 @@ static int mp_property_do_silent(const char *name, int action, void *val,
struct MPContext *ctx)
{
struct command_ctx *cmd = ctx->command_ctx;
cmd->silence_option_deprecations += 1;
int r = m_property_do(ctx->log, cmd->properties, name, action, val, ctx);
cmd->silence_option_deprecations -= 1;
if (r == M_PROPERTY_OK && is_property_set(action, val))
mp_notify_property(ctx, (char *)name);
return r;