summaryrefslogtreecommitdiffstats
path: root/options/options.c
diff options
context:
space:
mode:
authorRipose <ripose@protonmail.com>2021-11-13 15:55:53 -0800
committerDudemanguy <random342@airmail.cc>2022-01-19 14:27:04 +0000
commit04f0b0abe48d664aaa1400d1dddb02b434999b85 (patch)
treecc784261e29a6834d7e81ff763fc060867672748 /options/options.c
parent1ab3f56df0d7be3b4152bd9e0cc50c1938ff6d70 (diff)
downloadmpv-04f0b0abe48d664aaa1400d1dddb02b434999b85.tar.bz2
mpv-04f0b0abe48d664aaa1400d1dddb02b434999b85.tar.xz
options: add --sub-visibility=<primary-only|secondary-only>
Adds --sub-visibility choices 'primary-only' for only displaying the primary subtitle track, and 'secondary-only' for only displaying secondary subtitle track. Removes --secondary-sub-visibility and displays a message telling the user to use --sub-visibility=yes/primary-only instead. These changes make it so that the default 'sub-visibility' bind 'v' cycles through all the 'sub-visibility' choices, 'no', 'yes', 'primary-only', and 'secondary-only'.
Diffstat (limited to 'options/options.c')
-rw-r--r--options/options.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/options/options.c b/options/options.c
index 1341cb891c..9ba5a7ae41 100644
--- a/options/options.c
+++ b/options/options.c
@@ -240,8 +240,9 @@ 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_FLAG(sub_visibility)},
- {"secondary-sub-visibility", OPT_FLAG(sec_sub_visibility)},
+ {"sub-visibility", OPT_CHOICE(sub_visibility,
+ {"no", 0}, {"yes", 1}, {"primary-only", 2}, {"secondary-only", 3})
+ },
{"sub-forced-only", OPT_CHOICE(forced_subs_only,
{"auto", -1}, {"no", 0}, {"yes", 1})},
{"stretch-dvd-subs", OPT_FLAG(stretch_dvd_subs)},
@@ -285,7 +286,6 @@ 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,6 +880,8 @@ 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")},