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

af: remove legacy option parsing hacks

This commit is contained in:
wm4 2013-12-04 23:04:40 +01:00
parent 82983970b3
commit 09bd19e59e
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
audio/filter/af.c
View File

@ -116,7 +116,6 @@ const struct m_obj_list af_obj_list = {
{"force", "format"},
{0}
},
.legacy_hacks = true, // many filters have custom option parsing
};
static bool af_config_equals(struct mp_audio *a, struct mp_audio *b)
@ -206,19 +205,13 @@ static struct af_instance *af_create(struct af_stream *s, char *name,
struct m_config *config = m_config_from_obj_desc(af, &desc);
if (m_config_apply_defaults(config, name, s->opts->af_defs) < 0)
goto error;
if (m_config_initialize_obj(config, &desc, &af->priv, &args) < 0)
if (m_config_set_obj_params(config, args) < 0)
goto error;
af->priv = config->optstruct;
// Initialize the new filter
if (af->info->open(af) != AF_OK)
goto error;
if (args && af->control) {
// Single option string for old filters
char *opts = (char *)args; // m_config_initialize_obj did this
assert(!af->priv);
if (af->control(af, AF_CONTROL_COMMAND_LINE, opts) <= AF_ERROR)
goto error;
}
return af;

1
audio/filter/af.h
View File

@ -99,7 +99,6 @@ struct af_stream {
enum af_control {
AF_CONTROL_REINIT = 1,
AF_CONTROL_RESET,
AF_CONTROL_COMMAND_LINE,
AF_CONTROL_SET_RESAMPLE_RATE,
AF_CONTROL_SET_FORMAT,
AF_CONTROL_SET_CHANNELS,