diff options
author | wm4 <wm4@nowhere> | 2017-07-21 20:09:22 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-07-21 20:09:22 +0200 |
commit | 533ff28574ef179524a1f25b0b145d92137457a7 (patch) | |
tree | 66792754a26f8786ffa7c4b94f223c6342ebfb07 | |
parent | a22ff44f7bfe7737929a5d2ebccd38a198289c1a (diff) |
client API: drop some compatibility handling
See commit e4bc563fd2dcf for more information.
-rw-r--r-- | DOCS/interface-changes.rst | 3 | ||||
-rw-r--r-- | options/m_config.c | 15 |
2 files changed, 5 insertions, 13 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 7dcaf5c8eb..2fd57c9e90 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -22,6 +22,9 @@ Interface changes --- mpv 0.27.0 --- - drop previously deprecated --field-dominance option - drop previously deprecated "osd" command + - remove client API compatibility handling for "script", "sub-file", + "audio-file", "external-file" (these cases used to log a deprecation + warning) --- mpv 0.26.0 --- - remove remaining deprecated audio device options, like --alsa-device Some of them were removed in earlier releases. diff --git a/options/m_config.c b/options/m_config.c index 604f4a8133..65807bb14e 100644 --- a/options/m_config.c +++ b/options/m_config.c @@ -910,19 +910,8 @@ int m_config_set_option_node(struct m_config *config, bstr name, int r; struct m_config_option *co = m_config_get_co(config, name); - if (!co) { - co = m_config_get_co_raw(config, name); - if (co && co->opt->type == &m_option_type_cli_alias) { - /*bstr old_name = name; - co = m_config_mogrify_cli_opt(config, &name, &(bool){0}, &(int){0}); - */ - name = bstr0((char *)co->opt->priv); - MP_WARN(config, "Setting %.*s via API is deprecated, set %s instead.\n", - BSTR_P(name), co->opt->name); - } else { - return M_OPT_UNKNOWN; - } - } + if (!co) + return M_OPT_UNKNOWN; // Do this on an "empty" type to make setting the option strictly overwrite // the old value, as opposed to e.g. appending to lists. |