summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorAvi Halachmi (:avih) <avihpit@yahoo.com>2022-01-19 21:56:28 +0200
committerAvi Halachmi (:avih) <avihpit@yahoo.com>2022-01-19 21:56:28 +0200
commit9cddd73f67f11dba2f2921124e2c39c77af01651 (patch)
tree3148a8c3e43b33025c0c968d360e672a3794c409 /player
parent04f0b0abe48d664aaa1400d1dddb02b434999b85 (diff)
downloadmpv-9cddd73f67f11dba2f2921124e2c39c77af01651.tar.bz2
mpv-9cddd73f67f11dba2f2921124e2c39c77af01651.tar.xz
Revert "options: add --sub-visibility=<primary-only|secondary-only>"
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.
Diffstat (limited to 'player')
-rw-r--r--player/command.c12
1 files changed, 5 insertions, 7 deletions
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"},