X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_text.h;h=36a63f3dab0322d42c93b5e52167e64eab84ffd3;hb=96fdcb3161d25a5c5f82f29d89830682241f6f92;hp=fb1d846d8217d2c4f85af36c7b81270deff45db4;hpb=f41818f14369f170475b7f2bde1a2dd856517b14;p=dcpomatic.git diff --git a/src/lib/player_text.h b/src/lib/player_text.h index fb1d846d8..36a63f3da 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,31 @@ */ + #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; + 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