summaryrefslogtreecommitdiffstats
path: root/sub/osd_state.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-03-08 21:29:29 +0100
committerwm4 <wm4@nowhere>2016-03-08 22:00:02 +0100
commited254f29a93474defd932e52d6995628e01d82aa (patch)
tree9f14d969d2f45196d44532862794cf823b176970 /sub/osd_state.h
parentf5bfe01932b2895ad9b9faa8c04d8a1466dbeeb0 (diff)
downloadmpv-ed254f29a93474defd932e52d6995628e01d82aa.tar.bz2
mpv-ed254f29a93474defd932e52d6995628e01d82aa.tar.xz
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.
Diffstat (limited to 'sub/osd_state.h')
-rw-r--r--sub/osd_state.h11
1 files changed, 8 insertions, 3 deletions
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 {