From 9cddd73f67f11dba2f2921124e2c39c77af01651 Mon Sep 17 00:00:00 2001 From: "Avi Halachmi (:avih)" Date: Wed, 19 Jan 2022 21:56:28 +0200 Subject: Revert "options: add --sub-visibility=" This reverts commit 04f0b0abe48d664aaa1400d1dddb02b434999b85. It's not a good idea to unify the names only for visibility, while keeping secondary-* for everything else. This needs a bit more thought before we allow secondary sub to be visible on its own. --- options/options.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'options/options.c') diff --git a/options/options.c b/options/options.c index 9ba5a7ae41..1341cb891c 100644 --- a/options/options.c +++ b/options/options.c @@ -240,9 +240,8 @@ const struct m_sub_options mp_subtitle_sub_opts = { {"sub-delay", OPT_FLOAT(sub_delay)}, {"sub-fps", OPT_FLOAT(sub_fps)}, {"sub-speed", OPT_FLOAT(sub_speed)}, - {"sub-visibility", OPT_CHOICE(sub_visibility, - {"no", 0}, {"yes", 1}, {"primary-only", 2}, {"secondary-only", 3}) - }, + {"sub-visibility", OPT_FLAG(sub_visibility)}, + {"secondary-sub-visibility", OPT_FLAG(sec_sub_visibility)}, {"sub-forced-only", OPT_CHOICE(forced_subs_only, {"auto", -1}, {"no", 0}, {"yes", 1})}, {"stretch-dvd-subs", OPT_FLAG(stretch_dvd_subs)}, @@ -286,6 +285,7 @@ const struct m_sub_options mp_subtitle_sub_opts = { .size = sizeof(OPT_BASE_STRUCT), .defaults = &(OPT_BASE_STRUCT){ .sub_visibility = 1, + .sec_sub_visibility = 1, .forced_subs_only = -1, .sub_pos = 100, .sub_speed = 1.0, @@ -880,8 +880,6 @@ static const m_option_t mp_opts[] = { {"pphelp", OPT_REMOVED(NULL)}, {"rawaudio", OPT_REMOVED("use --demuxer-rawaudio-...")}, {"rawvideo", OPT_REMOVED("use --demuxer-rawvideo-...")}, - {"secondary-sub-visibility", OPT_REMOVED( - "use --sub-visibility=primary-only/yes")}, {"spugauss", OPT_REPLACED("sub-gauss")}, {"srate", OPT_REPLACED("audio-samplerate")}, {"ss", OPT_REPLACED("start")}, -- cgit v1.2.3