diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-07 22:15:01 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-07 22:15:01 +0200 |
| commit | 7bc2134d658778e04f1756c255e604b4ab5a5831 (patch) | |
| tree | b5ba51f2534604a6528fbbb130fd0cfca7d6fb70 /src/lib/player_text.h | |
| parent | a771a806291243760552988a1a7a5742bc007ee2 (diff) | |
Assorted C++11/formatting cleanups.
Diffstat (limited to 'src/lib/player_text.h')
| -rw-r--r-- | src/lib/player_text.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/player_text.h b/src/lib/player_text.h index 232ba6516..cd4be984c 100644 --- a/src/lib/player_text.h +++ b/src/lib/player_text.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,22 +18,26 @@ */ + #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<std::shared_ptr<dcpomatic::Font> > fonts_); + void add_fonts (std::list<std::shared_ptr<dcpomatic::Font>> fonts_); std::list<std::shared_ptr<dcpomatic::Font> > fonts; /** BitmapTexts, with their rectangles transformed as specified by their content */ @@ -41,4 +45,5 @@ public: std::list<StringText> string; }; + #endif |