X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_text.h;h=38affd5ef1cc0953e8bee3ad87b1df8dcc8fc94f;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=232ba65166f97b9f30d6eec9a4e0ff8c829139f0;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/lib/player_text.h b/src/lib/player_text.h index 232ba6516..38affd5ef 100644 --- a/src/lib/player_text.h +++ b/src/lib/player_text.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,27 +18,28 @@ */ + #ifndef DCPOMATIC_PLAYER_CAPTION_H #define DCPOMATIC_PLAYER_CAPTION_H + #include "bitmap_text.h" -#include "dcpomatic_time.h" #include "string_text.h" + namespace dcpomatic { class Font; } + /** A set of text (subtitle/CCAP) which span the same time period */ class PlayerText { public: - void add_fonts (std::list > fonts_); - std::list > fonts; - /** BitmapTexts, with their rectangles transformed as specified by their content */ std::list bitmap; std::list string; }; + #endif