From 1a2319f3e4cc42c680e2fd3ba30022c7a9adf3fe Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 25 Nov 2016 21:00:39 +0100 Subject: options: remove deprecated sub-option handling for --vo and --ao Long planned. Leads to some sanity. There still are some rather gross things. Especially g_groups is ugly, and a hack that can hopefully be removed. (There is a plan for it, but whether it's implemented depends on how much energy is left.) --- video/out/vo.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'video/out/vo.h') diff --git a/video/out/vo.h b/video/out/vo.h index 99e6ccabae..724e03ca41 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -312,17 +312,16 @@ struct vo_driver { const void *priv_defaults; // List of options to parse into priv struct (requires priv_size to be set) - // Deprecated. Use global options or global_opts instead. + // This will register them as global options (with options_prefix), and + // copy the current value at VO creation time to the priv struct. const struct m_option *options; - // Global options to register if the VO is compiled in. - // mp_get_config_group() or other function can be used to access them. - const struct m_sub_options *global_opts; + // All options in the above array are prefixed with this string. (It's just + // for convenience and makes no difference in semantics.) + const char *options_prefix; - // Evil hack: add .options as global options, using the provided prefix. - // For further evilness, the options will be copied to the priv struct - // like with normal .options behavior. - const char *legacy_prefix; + // Registers global options that go to a separate options struct. + const struct m_sub_options *global_opts; }; struct vo { @@ -356,7 +355,6 @@ struct vo { struct m_config_cache *opts_cache; // cache for ->opts struct mp_vo_opts *opts; - struct m_config *config; // config for ->priv bool want_redraw; // redraw as soon as possible -- cgit v1.2.3