From ed254f29a93474defd932e52d6995628e01d82aa Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 8 Mar 2016 21:29:29 +0100 Subject: osd: restructure and move ASS objects into its own struct All ASS objects used by the OSD renderer go into struct ass_state. Preparation for the following commit. --- sub/osd_state.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'sub/osd_state.h') diff --git a/sub/osd_state.h b/sub/osd_state.h index 9ef8458f0d..66fee5a387 100644 --- a/sub/osd_state.h +++ b/sub/osd_state.h @@ -7,6 +7,13 @@ #define OSD_CONV_CACHE_MAX 4 +struct ass_state { + struct mp_log *log; + struct ass_track *track; + struct ass_renderer *render; + struct ass_library *library; +}; + struct osd_object { int type; // OSDTYPE_* bool is_sub; @@ -38,9 +45,7 @@ struct osd_object { // Internally used by osd_libass.c struct sub_bitmaps parts_cache; - struct ass_track *osd_track; - struct ass_renderer *osd_render; - struct ass_library *osd_ass_library; + struct ass_state ass; }; struct osd_state { -- cgit v1.2.3