From f8ab59eacdde31af39f4defeb964adf4de140a50 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 21 May 2018 16:25:52 +0200 Subject: player: get rid of mpv_global.opts This was always a legacy thing. Remove it by applying an orgy of mp_get_config_group() calls, and sometimes m_config_cache_alloc() or mp_read_option_raw(). win32 changes untested. --- options/parse_commandline.c | 6 ++---- options/parse_commandline.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'options') diff --git a/options/parse_commandline.c b/options/parse_commandline.c index 68d36c6500..d2eb01966c 100644 --- a/options/parse_commandline.c +++ b/options/parse_commandline.c @@ -281,10 +281,8 @@ err_out: * during normal options parsing. */ void m_config_preparse_command_line(m_config_t *config, struct mpv_global *global, - char **argv) + int *verbose, char **argv) { - struct MPOpts *opts = global->opts; - struct parse_state p = {config, argv}; while (split_opt_silent(&p) == 0) { if (p.is_opt) { @@ -293,7 +291,7 @@ void m_config_preparse_command_line(m_config_t *config, struct mpv_global *globa int flags = M_SETOPT_FROM_CMDLINE | M_SETOPT_PRE_PARSE_ONLY; m_config_set_option_cli(config, p.arg, p.param, flags); if (bstrcmp0(p.arg, "v") == 0) - opts->verbose++; + (*verbose)++; } } diff --git a/options/parse_commandline.h b/options/parse_commandline.h index 8c39047814..1509fc94e2 100644 --- a/options/parse_commandline.h +++ b/options/parse_commandline.h @@ -27,6 +27,6 @@ struct mpv_global; int m_config_parse_mp_command_line(m_config_t *config, struct playlist *files, struct mpv_global *global, char **argv); void m_config_preparse_command_line(m_config_t *config, struct mpv_global *global, - char **argv); + int *verbose, char **argv); #endif /* MPLAYER_PARSER_MPCMD_H */ -- cgit v1.2.3