From 319405830996b2bc73e9cdf437e389f2045adafe Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 15 Dec 2013 13:43:26 +0100
Subject: player: don't store subtitle renderer in osd_state

This doesn't have much value. It can't be accessed by anything else than
the actual subtitle renderer (sd_ass.c). sd_ass.c could create the
renderer itself, except that we apparently want to save memory (and some
font loading time) when using ordered chapters or multiple subtitle
tracks.
---
 sub/osd.c | 3 +--
 sub/osd.h | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'sub')

diff --git a/sub/osd.c b/sub/osd.c
index a1daa1b390..02b28b3885 100644
--- a/sub/osd.c
+++ b/sub/osd.c
@@ -79,12 +79,11 @@ static bool osd_res_equals(struct mp_osd_res a, struct mp_osd_res b)
         && a.display_par == b.display_par;
 }
 
-struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib)
+struct osd_state *osd_create(struct MPOpts *opts)
 {
     struct osd_state *osd = talloc_zero(NULL, struct osd_state);
     *osd = (struct osd_state) {
         .opts = opts,
-        .ass_library = asslib,
         .osd_text = talloc_strdup(osd, ""),
         .sub_text = talloc_strdup(osd, ""),
         .progbar_type = -1,
diff --git a/sub/osd.h b/sub/osd.h
index 6399804288..7f8a2f2141 100644
--- a/sub/osd.h
+++ b/sub/osd.h
@@ -122,8 +122,6 @@ struct osd_object {
 struct osd_state {
     struct osd_object *objs[MAX_OSD_PARTS];
 
-    struct ass_library *ass_library;
-    struct ass_renderer *ass_renderer;
     double video_offset;
     double vo_pts;
 
@@ -206,7 +204,7 @@ struct osd_style_opts {
 
 extern const struct m_sub_options osd_style_conf;
 
-struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib);
+struct osd_state *osd_create(struct MPOpts *opts);
 void osd_set_text(struct osd_state *osd, const char *text);
 void osd_set_sub(struct osd_state *osd, const char *text);
 void osd_changed(struct osd_state *osd, int new_value);
-- 
cgit v1.2.3