X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_text.h;h=45c8bf589f39339b35b5df491b96e25d43271c71;hb=6cac49dc50dae6b173135df101d532f20031ca70;hp=93b6cd9706d99a07ca298b10da3e3eb0682d3c92;hpb=ae95d9cab28e414245e15ddeae20e96735594a8b;p=dcpomatic.git

diff --git a/src/lib/player_text.h b/src/lib/player_text.h
index 93b6cd970..45c8bf589 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,25 +18,32 @@
 
 */
 
-#ifndef DCPOMATIC_PLAYER_TEXT_H
-#define DCPOMATIC_PLAYER_TEXT_H
+
+#ifndef DCPOMATIC_PLAYER_CAPTION_H
+#define DCPOMATIC_PLAYER_CAPTION_H
+
 
 #include "bitmap_text.h"
 #include "dcpomatic_time.h"
-#include "plain_text.h"
+#include "string_text.h"
+
+
+namespace dcpomatic {
+	class Font;
+}
 
-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;
+	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 */
-	std::list<BitmapText> image;
-	std::list<PlainText> text;
+	std::list<BitmapText> bitmap;
+	std::list<StringText> string;
 };
 
+
 #endif