diff options
author | wm4 <wm4@nowhere> | 2014-06-13 02:16:47 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-06-13 02:16:47 +0200 |
commit | a64e099efcc835e93ea9dafff9bb01829d632fa6 (patch) | |
tree | 810f252124f10ace8b5f929f347580822ca407b5 /options/options.c | |
parent | e00aad18cb76d39cc520526cece1505c63a8afe0 (diff) | |
download | mpv-a64e099efcc835e93ea9dafff9bb01829d632fa6.tar.bz2 mpv-a64e099efcc835e93ea9dafff9bb01829d632fa6.tar.xz |
options: remove some unneeded stuff
No options pointing to global variables are in use anymore, so that part
can be removed.
Diffstat (limited to 'options/options.c')
-rw-r--r-- | options/options.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/options/options.c b/options/options.c index 5f2ca9687d..f9814e9da9 100644 --- a/options/options.c +++ b/options/options.c @@ -88,20 +88,21 @@ static const m_option_t screenshot_conf[] = { const m_option_t mp_opts[] = { // handled in command line pre-parser (parse_commandline.c) - {"v", NULL, CONF_TYPE_STORE, CONF_GLOBAL | CONF_NOCFG, 0, 0, NULL}, - {"playlist", NULL, CONF_TYPE_STRING, CONF_NOCFG | M_OPT_MIN | M_OPT_FIXED, - 1, 0, NULL}, - {"{", NULL, CONF_TYPE_STORE, CONF_NOCFG | M_OPT_FIXED, 0, 0, NULL}, - {"}", NULL, CONF_TYPE_STORE, CONF_NOCFG | M_OPT_FIXED, 0, 0, NULL}, + {"v", CONF_TYPE_STORE, CONF_GLOBAL | CONF_NOCFG, .offset = -1}, + {"playlist", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_MIN | M_OPT_FIXED, + .min = 1, .offset = -1}, + {"{", CONF_TYPE_STORE, CONF_NOCFG | M_OPT_FIXED, .offset = -1}, + {"}", CONF_TYPE_STORE, CONF_NOCFG | M_OPT_FIXED, .offset = -1}, // handled in m_config.c - { "include", NULL, CONF_TYPE_STRING, M_OPT_FIXED }, - { "profile", NULL, CONF_TYPE_STRING_LIST, M_OPT_FIXED }, - { "show-profile", NULL, CONF_TYPE_STRING, CONF_NOCFG | M_OPT_FIXED }, - { "list-options", NULL, CONF_TYPE_STORE, CONF_NOCFG | M_OPT_FIXED }, + { "include", CONF_TYPE_STRING, M_OPT_FIXED, .offset = -1}, + { "profile", CONF_TYPE_STRING_LIST, M_OPT_FIXED, .offset = -1}, + { "show-profile", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_FIXED, .offset = -1}, + { "list-options", CONF_TYPE_STORE, CONF_NOCFG | M_OPT_FIXED, .offset = -1}, // handled in main.c (looks at the raw argv[]) - {"leak-report", NULL, CONF_TYPE_STORE, CONF_GLOBAL | CONF_NOCFG | M_OPT_FIXED }, + { "leak-report", CONF_TYPE_STORE, CONF_GLOBAL | CONF_NOCFG | M_OPT_FIXED, + .offset = -1 }, OPT_FLAG("shuffle", shuffle, CONF_GLOBAL | CONF_NOCFG), @@ -501,7 +502,8 @@ const m_option_t mp_opts[] = { OPT_FLAG("input-terminal", consolecontrols, CONF_GLOBAL), OPT_FLAG("input-cursor", vo.enable_mouse_movements, CONF_GLOBAL), - {"screenshot", (void *) screenshot_conf, CONF_TYPE_SUBCONFIG}, + {"screenshot", CONF_TYPE_SUBCONFIG, .priv = (void *)screenshot_conf, + .offset = -1}, OPT_SUBSTRUCT("input", input_opts, input_config, 0), |