Supporters update.

[dcpomatic.git] / src / lib / player_text.h

diff --git a/src/lib/player_text.h b/src/lib/player_text.h
index 5a8799116fff7510790ca577edcaf8a7cf3d823e..5921b28f6f5a1c3af9e550e86390c5d440f14ed0 100644 (file)
--- 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,25 +18,28 @@
 
 */
 
+
 #ifndef DCPOMATIC_PLAYER_CAPTION_H
 #define DCPOMATIC_PLAYER_CAPTION_H
 
+
 #include "bitmap_text.h"
-#include "dcpomatic_time.h"
 #include "string_text.h"
 
-class Font;
+
+namespace dcpomatic {
+       class Font;
+}
+
 
 /** A set of text (subtitle/CCAP) which span the same time period */
 class PlayerText
 {
 public:
-       void add_fonts (std::list<boost::shared_ptr<Font> > fonts_);
-       std::list<boost::shared_ptr<Font> > fonts;
-
        /** BitmapTexts, with their rectangles transformed as specified by their content */
-       std::list<BitmapText> image;
-       std::list<StringText> text;
+       std::vector<BitmapText> bitmap;
+       std::vector<StringText> string;
 };
 
+
 #endif