summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorDan Oscarsson <DanOscarsson@users.noreply.github.com>2016-10-02 17:08:14 +0200
committerwm4 <wm4@nowhere>2016-10-03 16:57:04 +0200
commit7debdde9b91833e63b800181d8d3aaf3099bdfaa (patch)
tree94aa175e2826178afe84e5a07dddca949abea395 /sub
parent81d125efd8f66f560ee5e169bfd641daf64be1db (diff)
downloadmpv-7debdde9b91833e63b800181d8d3aaf3099bdfaa.tar.bz2
mpv-7debdde9b91833e63b800181d8d3aaf3099bdfaa.tar.xz
options: rename subtitle options
Rename the text subtitle options from --sub-text- to --sub- and --ass- options to --sub-ass-. The intention is to common sub options to prefixed --sub- and special ASS option be seen as a special version of sub options. The OSD options that work like the --sub- options are still named --osd-. Man page updated including a short note about renamed --sub-text-* and --ass-* options to --sub-* and --sub-ass-*.
Diffstat (limited to 'sub')
-rw-r--r--sub/sd_ass.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 2d9024f2d7..31c66a6087 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -75,7 +75,7 @@ static void mp_ass_add_default_styles(ASS_Track *track, struct MPOpts *opts)
track->default_style = sid;
ASS_Style *style = track->styles + sid;
style->Name = strdup("Default");
- mp_ass_set_style(style, track->PlayResY, opts->sub_text_style);
+ mp_ass_set_style(style, track->PlayResY, opts->sub_style);
}
if (opts->ass_style_override)
@@ -138,7 +138,7 @@ static void enable_output(struct sd *sd, bool enable)
} else {
ctx->ass_renderer = ass_renderer_init(ctx->ass_library);
- mp_ass_configure_fonts(ctx->ass_renderer, sd->opts->sub_text_style,
+ mp_ass_configure_fonts(ctx->ass_renderer, sd->opts->sub_style,
sd->global, sd->log);
}
}
@@ -335,12 +335,12 @@ static void configure_ass(struct sd *sd, struct mp_osd_res *dim,
#endif
ass_set_selective_style_override_enabled(priv, set_force_flags);
ASS_Style style = {0};
- mp_ass_set_style(&style, 288, opts->sub_text_style);
+ mp_ass_set_style(&style, 288, opts->sub_style);
ass_set_selective_style_override(priv, &style);
free(style.FontName);
if (converted && track->default_style < track->n_styles) {
mp_ass_set_style(track->styles + track->default_style,
- track->PlayResY, opts->sub_text_style);
+ track->PlayResY, opts->sub_style);
}
ass_set_font_scale(priv, set_font_scale);
ass_set_hinting(priv, set_hinting);