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. --- player/command.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'player') diff --git a/player/command.c b/player/command.c index 8d0b5c859d..4f2eb4741d 100644 --- a/player/command.c +++ b/player/command.c @@ -4003,13 +4003,11 @@ static const struct property_osd_display { {"sub-delay", "Sub delay"}, {"sub-speed", "Sub speed"}, {"sub-visibility", - .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})}" - }, + .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)}}"}, {"sub-forced-only", "Forced sub only"}, {"sub-scale", "Sub Scale"}, {"sub-ass-vsfilter-aspect-compat", "Subtitle VSFilter aspect compat"}, -- cgit v1.2.3