diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-09-19 16:51:43 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-09-22 14:20:38 +0000 |
| commit | 8a7704ea8928f0a7342757e89c64f022a21cdef8 (patch) | |
| tree | 0ad2b01b9c5b4d2b6064a1772f9582dd21c7c7f7 /options | |
| parent | 6ea9ec9931d3cb65f812b79fec6c14eab7d05070 (diff) | |
| download | mpv-8a7704ea8928f0a7342757e89c64f022a21cdef8.tar.bz2 mpv-8a7704ea8928f0a7342757e89c64f022a21cdef8.tar.xz | |
stream_bluray: move --bluray-device to stream_bluray_opts
Similar to the previous commit. There's no reason for --bluray-device to
be in MPOpts. Make a specific subopt for stream_bluray and use that
instead so we can remove the mp_read_option_raw call.
Diffstat (limited to 'options')
| -rw-r--r-- | options/options.c | 3 | ||||
| -rw-r--r-- | options/options.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/options/options.c b/options/options.c index c6a0873b31..523f172298 100644 --- a/options/options.c +++ b/options/options.c @@ -56,6 +56,7 @@ static void print_version(struct mp_log *log) } extern const struct m_sub_options tv_params_conf; +extern const struct m_sub_options stream_bluray_conf; extern const struct m_sub_options stream_cdda_conf; extern const struct m_sub_options stream_dvb_conf; extern const struct m_sub_options stream_lavf_conf; @@ -483,7 +484,7 @@ static const m_option_t mp_opts[] = { #endif {"edition", OPT_CHOICE(edition_id, {"auto", -1}), M_RANGE(0, 8190)}, #if HAVE_LIBBLURAY - {"bluray-device", OPT_STRING(bluray_device), .flags = M_OPT_FILE}, + {"bluray", OPT_SUBSTRUCT(stream_bluray_opts, stream_bluray_conf)}, #endif /* HAVE_LIBBLURAY */ // ------------------------- demuxer options -------------------- diff --git a/options/options.h b/options/options.h index 6f3d80239f..498d4aae85 100644 --- a/options/options.h +++ b/options/options.h @@ -321,6 +321,7 @@ typedef struct MPOpts { int w32_priority; + struct bluray_opts *stream_bluray_opts; struct cdda_params *stream_cdda_opts; struct dvb_params *stream_dvb_opts; struct stream_lavf_params *stream_lavf_opts; |