diff options
author | wm4 <wm4@nowhere> | 2014-07-15 01:49:02 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-07-15 01:49:02 +0200 |
commit | 23a7257cca5982fa44300825ea489ba95a7e4c17 (patch) | |
tree | 5c03e6b1e0127d2e6b72fa168ea0dce8294ca122 /options | |
parent | 4b93210e0c244a65ef10a566abed2ad25ecaf9a1 (diff) | |
download | mpv-23a7257cca5982fa44300825ea489ba95a7e4c17.tar.bz2 mpv-23a7257cca5982fa44300825ea489ba95a7e4c17.tar.xz |
Revert "Remove DVD and Bluray support"
This reverts commit 4b93210e0c244a65ef10a566abed2ad25ecaf9a1.
*shrug*
Diffstat (limited to 'options')
-rw-r--r-- | options/options.c | 11 | ||||
-rw-r--r-- | options/options.h | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/options/options.c b/options/options.c index 21adaf76c4..84eda8db64 100644 --- a/options/options.c +++ b/options/options.c @@ -147,9 +147,18 @@ const m_option_t mp_opts[] = { ({"no", 0})), OPT_INTRANGE("cache-pause-restart", stream_cache_unpause, 0, 0, 0x7fffffff), +#if HAVE_DVDREAD || HAVE_DVDNAV + OPT_STRING("dvd-device", dvd_device, 0), + OPT_INT("dvd-speed", dvd_speed, 0), + OPT_INTRANGE("dvd-angle", dvd_angle, 0, 1, 99), +#endif /* HAVE_DVDREAD */ OPT_INTPAIR("chapter", chapterrange, 0), OPT_CHOICE_OR_INT("edition", edition_id, 0, 0, 8190, ({"auto", -1})), +#if HAVE_LIBBLURAY + OPT_STRING("bluray-device", bluray_device, 0), + OPT_INTRANGE("bluray-angle", bluray_angle, 0, 0, 999), +#endif /* HAVE_LIBBLURAY */ OPT_STRINGLIST("http-header-fields", network_http_header_fields, 0), OPT_STRING("user-agent", network_useragent, 0), @@ -631,6 +640,8 @@ const struct MPOpts mp_default_opts = { .index_mode = 1, + .dvd_angle = 1, + .mf_fps = 1.0, }; diff --git a/options/options.h b/options/options.h index 9cd5f800d9..100fded4a3 100644 --- a/options/options.h +++ b/options/options.h @@ -251,6 +251,12 @@ typedef struct MPOpts { struct dvb_params *stream_dvb_opts; char *cdrom_device; + int dvd_title; + int dvd_angle; + int dvd_speed; + char *dvd_device; + int bluray_angle; + char *bluray_device; double mf_fps; char *mf_type; |