From 5e30e7a04125e3c503160a76bbfe9361bff561fd Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 8 Sep 2016 21:46:48 +0200 Subject: stream_dvd, stream_dvdnav: remove weird option parsing stuff Same deal as with stream_bluray. Untested because I don't give a fuck about your shitty DVDs. --- options/options.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'options/options.c') diff --git a/options/options.c b/options/options.c index 64b264323e..078f606289 100644 --- a/options/options.c +++ b/options/options.c @@ -212,6 +212,22 @@ const struct m_sub_options vo_sub_opts = { }, }; +#undef OPT_BASE_STRUCT +#define OPT_BASE_STRUCT struct dvd_opts + +const struct m_sub_options dvd_conf = { + .opts = (const struct m_option[]){ + OPT_STRING("dvd-device", device, M_OPT_FILE), + OPT_INT("dvd-speed", speed, 0), + OPT_INTRANGE("dvd-angle", angle, 0, 1, 99), + {0} + }, + .size = sizeof(struct dvd_opts), + .defaults = &(const struct dvd_opts){ + .angle = 1, + }, +}; + #undef OPT_BASE_STRUCT #define OPT_BASE_STRUCT struct MPOpts @@ -275,9 +291,7 @@ const m_option_t mp_opts[] = { OPT_SUBSTRUCT("", stream_cache, stream_cache_conf, 0), #if HAVE_DVDREAD || HAVE_DVDNAV - OPT_STRING("dvd-device", dvd_device, M_OPT_FILE), - OPT_INT("dvd-speed", dvd_speed, 0), - OPT_INTRANGE("dvd-angle", dvd_angle, 0, 1, 99), + OPT_SUBSTRUCT("", dvd_opts, dvd_conf, 0), #endif /* HAVE_DVDREAD */ OPT_INTPAIR("chapter", chapterrange, 0), OPT_CHOICE_OR_INT("edition", edition_id, 0, 0, 8190, @@ -855,8 +869,6 @@ const struct MPOpts mp_default_opts = { .index_mode = 1, - .dvd_angle = 1, - .mf_fps = 1.0, .display_tags = (char **)(const char*[]){ -- cgit v1.2.3