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.
This commit is contained in:
wm4
2016-03-08 21:29:29 +01:00
parent f5bfe01932
commit ed254f29a9
2 changed files with 81 additions and 61 deletions

View File

@@ -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 {