diff options
| author | wm4 <wm4@nowhere> | 2014-06-13 02:17:31 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-13 02:18:26 +0200 |
| commit | b7bedbbc367b0e248880d25139056a690ac996a2 (patch) | |
| tree | 838eb2b7467089e39d8eea4d3a3995e7a5e7f0c0 /options/options.c | |
| parent | a64e099efcc835e93ea9dafff9bb01829d632fa6 (diff) | |
| download | mpv-b7bedbbc367b0e248880d25139056a690ac996a2.tar.bz2 mpv-b7bedbbc367b0e248880d25139056a690ac996a2.tar.xz | |
options: remove some more stuff
The "classic" sub-option stuff is not really needed anymore. The only
remaining use can be emulated in a simpler way. But note that this
breaks the --screenshot option (instead of the "flat" options like
--screenshot-...). This was undocumented and discouraged, so it
shouldn't affect anyone.
Diffstat (limited to 'options/options.c')
| -rw-r--r-- | options/options.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/options/options.c b/options/options.c index f9814e9da9..4140c10c5a 100644 --- a/options/options.c +++ b/options/options.c @@ -80,12 +80,6 @@ extern const struct m_obj_list ao_obj_list; #define OPT_BASE_STRUCT struct MPOpts -static const m_option_t screenshot_conf[] = { - OPT_SUBSTRUCT("", screenshot_image_opts, image_writer_conf, 0), - OPT_STRING("template", screenshot_template, 0), - {0}, -}; - const m_option_t mp_opts[] = { // handled in command line pre-parser (parse_commandline.c) {"v", CONF_TYPE_STORE, CONF_GLOBAL | CONF_NOCFG, .offset = -1}, @@ -502,8 +496,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", CONF_TYPE_SUBCONFIG, .priv = (void *)screenshot_conf, - .offset = -1}, + OPT_SUBSTRUCT("screenshot", screenshot_image_opts, image_writer_conf, 0), + OPT_STRING("screenshot-template", screenshot_template, 0), OPT_SUBSTRUCT("input", input_opts, input_config, 0), |