Barely-functioning GL playback with new arrangement.

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

diff --git a/src/lib/player_text.h b/src/lib/player_text.h
index 93b6cd9706d99a07ca298b10da3e3eb0682d3c92..fb1d846d8217d2c4f85af36c7b81270deff45db4 100644 (file)
--- a/src/lib/player_text.h
+++ b/src/lib/player_text.h
@@ -18,25 +18,27 @@
 
 */
 
-#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"
 
-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;
+       void add_fonts (std::list<boost::shared_ptr<dcpomatic::Font> > fonts_);
+       std::list<boost::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