From 4d1ffecabc457e31e51c6331ed89304ff45dc671 Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Tue, 6 Jun 2017 22:16:29 +0200 Subject: options: slight cleanup of --sub-ass-style-override List of changes: 1. Rename `signfs` to `scale`, to better match what it actually does (force --sub-scale to apply to ASS subtitles), and fix the blatantly wrong documentation (it actually specifically does *not* apply to signs) 2. Rename `--sub-ass-style-override` to `--sub-ass-override` to help reduce confusion between it and `--sub-ass-force-style`, as well as pointing out that it doesn't necessarily actually override styles. (The new `scale` option, for example, only sets ASS_OVERRIDE_BIT_FONT_SIZE, but not ASS_OVERRIDE_BIT_STYLE) 3. Mention that `--sub-ass-override` is generally sort of smart about only overriding dialog, not signs. --- options/options.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'options') diff --git a/options/options.c b/options/options.c index 949de1945b..d20aa03b99 100644 --- a/options/options.c +++ b/options/options.c @@ -511,8 +511,8 @@ const m_option_t mp_opts[] = { OPT_CHOICE("sub-ass-shaper", ass_shaper, UPDATE_OSD, ({"simple", 0}, {"complex", 1})), OPT_FLAG("sub-ass-justify", ass_justify, 0), - OPT_CHOICE("sub-ass-style-override", ass_style_override, UPDATE_OSD, - ({"no", 0}, {"yes", 1}, {"force", 3}, {"signfs", 4}, {"strip", 5})), + OPT_CHOICE("sub-ass-override", ass_style_override, UPDATE_OSD, + ({"no", 0}, {"yes", 1}, {"force", 3}, {"scale", 4}, {"strip", 5})), OPT_FLAG("sub-scale-by-window", sub_scale_by_window, UPDATE_OSD), OPT_FLAG("sub-scale-with-window", sub_scale_with_window, UPDATE_OSD), OPT_FLAG("sub-ass-scale-with-window", ass_scale_with_window, UPDATE_OSD), @@ -844,6 +844,7 @@ const m_option_t mp_opts[] = { OPT_REPLACED("ass-shaper", "sub-ass-shaper"), OPT_REPLACED("ass-style-override", "sub-ass-style-override"), OPT_REPLACED("ass-scale-with-window", "sub-ass-scale-with-window"), + OPT_REPLACED("sub-ass-style-override", "sub-ass-override"), OPT_REMOVED("fs-black-out-screens", NULL), OPT_REPLACED_MSG("loop", "loop-playlist", "--loop will be changed to map to" " --loop-file in future releases."), -- cgit v1.2.3