From 8bf34950c101fbc6c0fd7135be600e6d53395ff6 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 29 Nov 2015 13:53:55 +0100 Subject: sub: remove unused function, move another one mp_ass_default_track() was not used by anything anymore (commit 5a89150a got rid of it). mp_ass_add_default_styles() is used by sd_ass.c only. --- sub/ass_mp.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'sub/ass_mp.c') diff --git a/sub/ass_mp.c b/sub/ass_mp.c index df32d17ce6..b30b9964de 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -78,42 +78,6 @@ void mp_ass_set_style(ASS_Style *style, double res_y, style->Bold = opts->bold; } -// Add default styles, if the track does not have any styles yet. -// Apply style overrides if the user provides any. -void mp_ass_add_default_styles(ASS_Track *track, struct MPOpts *opts) -{ - if (opts->ass_styles_file && opts->ass_style_override) - ass_read_styles(track, opts->ass_styles_file, NULL); - - if (track->n_styles == 0) { - if (!track->PlayResY) { - track->PlayResY = MP_ASS_FONT_PLAYRESY; - track->PlayResX = track->PlayResY * 4 / 3; - } - track->Kerning = true; - int sid = ass_alloc_style(track); - 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); - } - - if (opts->ass_style_override) - ass_process_force_style(track); -} - -ASS_Track *mp_ass_default_track(ASS_Library *library, struct MPOpts *opts) -{ - ASS_Track *track = ass_new_track(library); - - track->track_type = TRACK_TYPE_ASS; - track->Timer = 100.; - - mp_ass_add_default_styles(track, opts); - - return track; -} - void mp_ass_configure_fonts(ASS_Renderer *priv, struct osd_style_opts *opts, struct mpv_global *global, struct mp_log *log) { -- cgit v1.2.3