diff options
author | wm4 <wm4@nowhere> | 2013-12-15 13:43:26 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-15 13:44:39 +0100 |
commit | 319405830996b2bc73e9cdf437e389f2045adafe (patch) | |
tree | 70095e57e72d584d2a1b97dcf64d423e7a019e9a /sub | |
parent | 4ca740ccf9314f77078e08f1923d86b060643aa5 (diff) | |
download | mpv-319405830996b2bc73e9cdf437e389f2045adafe.tar.bz2 mpv-319405830996b2bc73e9cdf437e389f2045adafe.tar.xz |
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.
Diffstat (limited to 'sub')
-rw-r--r-- | sub/osd.c | 3 | ||||
-rw-r--r-- | sub/osd.h | 4 |
2 files changed, 2 insertions, 5 deletions
@@ -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, @@ -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); |