From 8a7704ea8928f0a7342757e89c64f022a21cdef8 Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Tue, 19 Sep 2023 16:51:43 -0500 Subject: 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. --- options/options.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'options/options.c') 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 -------------------- -- cgit v1.2.3