From 876a3bafc5a0cb491ee1f1d5e928cd6e6ef530a8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 8 Mar 2016 21:54:17 +0100 Subject: osd: cleanup: make OSDTYPE_ constants private to OSD code No need to have them everywhere. The only exception/annoyance is MAX_OSD_PARTS, which is now basically duplicated (and at runtime initialization is checked with an assert()). --- sub/osd_state.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'sub/osd_state.h') diff --git a/sub/osd_state.h b/sub/osd_state.h index c52c3354cd..0fff668d2d 100644 --- a/sub/osd_state.h +++ b/sub/osd_state.h @@ -7,6 +7,18 @@ #define OSD_CONV_CACHE_MAX 4 +enum mp_osdtype { + OSDTYPE_SUB, + OSDTYPE_SUB2, // IDs must be numerically successive + + OSDTYPE_OSD, + + OSDTYPE_EXTERNAL, + OSDTYPE_EXTERNAL2, + + OSDTYPE_COUNT +}; + struct ass_state { struct mp_log *log; struct ass_track *track; -- cgit v1.2.3