From ca9c81b0d30d630a950a0d830fe8d98ab0131eef Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 4 Jan 2013 16:10:17 +0100 Subject: sub: add --sub-text-* options to unstyled text subtitles font Before this commit, the --osd-* options (like --osd-font-size etc.) configured both the OSD and subtitle font. Make them separate, and add --sub-text-* options (like --sub-text-size etc.). Now --osd-* affects the OSD font only, and --sub-text-* unstyled text subtitles only. --- sub/ass_mp.c | 2 +- sub/osd_libass.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sub') diff --git a/sub/ass_mp.c b/sub/ass_mp.c index 44f01ac186..ae069662c6 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -90,7 +90,7 @@ ASS_Track *mp_ass_default_track(ASS_Library *library, struct MPOpts *opts) ASS_Style *style = track->styles + sid; style->Name = strdup("Default"); style->Alignment = 2; - mp_ass_set_style(style, opts->osd_style); + mp_ass_set_style(style, opts->sub_text_style); } if (opts->ass_style_override) diff --git a/sub/osd_libass.c b/sub/osd_libass.c index 749b46d6ae..b34292ce16 100644 --- a/sub/osd_libass.c +++ b/sub/osd_libass.c @@ -223,7 +223,7 @@ static void update_sub(struct osd_state *osd, struct osd_object *obj) if (!obj->osd_track) obj->osd_track = mp_ass_default_track(osd->osd_ass_library, osd->opts); - struct osd_style_opts font = *opts->osd_style; + struct osd_style_opts font = *opts->sub_text_style; font.font_size *= opts->sub_scale; ASS_Style *style = obj->osd_track->styles + obj->osd_track->default_style; -- cgit v1.2.3