From 04f0b0abe48d664aaa1400d1dddb02b434999b85 Mon Sep 17 00:00:00 2001 From: Ripose Date: Sat, 13 Nov 2021 15:55:53 -0800 Subject: options: add --sub-visibility= 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'. --- player/command.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'player/command.c') diff --git a/player/command.c b/player/command.c index 4f2eb4741d..8d0b5c859d 100644 --- a/player/command.c +++ b/player/command.c @@ -4003,11 +4003,13 @@ static const struct property_osd_display { {"sub-delay", "Sub delay"}, {"sub-speed", "Sub speed"}, {"sub-visibility", - .msg = "Subtitles ${!sub-visibility==yes:hidden}" - "${?sub-visibility==yes:visible${?sub==no: (but no subtitles selected)}}"}, - {"secondary-sub-visibility", - .msg = "Secondary Subtitles ${!secondary-sub-visibility==yes:hidden}" - "${?secondary-sub-visibility==yes:visible${?secondary-sid==no: (but no secondary subtitles selected)}}"}, + .msg = "Subtitles ${?sub-visibility==no:hidden}" + "${?sub-visibility==yes:visible}" + "${?sub-visibility==primary-only:visible (primary only" + "${?sid==no: but no subtitles selected})}" + "${?sub-visibility==secondary-only:visible (secondary only" + "${?secondary-sid==no: but no subtitles selected})}" + }, {"sub-forced-only", "Forced sub only"}, {"sub-scale", "Sub Scale"}, {"sub-ass-vsfilter-aspect-compat", "Subtitle VSFilter aspect compat"}, -- cgit v1.2.3