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. --- sub/sd_ass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sub') diff --git a/sub/sd_ass.c b/sub/sd_ass.c index e81583c768..8a21ea0f42 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -313,7 +313,7 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim, bool set_scale_by_window = true; bool total_override = false; // With forced overrides, apply the --sub-* specific options - if (converted || opts->ass_style_override == 3) { + if (converted || opts->ass_style_override == 3) { // 'force' set_scale_with_window = opts->sub_scale_with_window; set_use_margins = opts->sub_use_margins; set_scale_by_window = opts->sub_scale_by_window; @@ -343,7 +343,7 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim, int set_force_flags = 0; if (total_override) set_force_flags |= ASS_OVERRIDE_BIT_STYLE | ASS_OVERRIDE_BIT_FONT_SIZE; - if (opts->ass_style_override == 4) + if (opts->ass_style_override == 4) // 'scale' set_force_flags |= ASS_OVERRIDE_BIT_FONT_SIZE; #if LIBASS_VERSION >= 0x01201001 if (converted) -- cgit v1.2.3