Make FileError say what path the problem was with.

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

diff --git a/src/lib/player_text.h b/src/lib/player_text.h
index 93b6cd9706d99a07ca298b10da3e3eb0682d3c92..3f5066314cc256ae198a70290660134dce14ca71 100644 (file)
--- a/src/lib/player_text.h
+++ b/src/lib/player_text.h
@@ -18,12 +18,12 @@
 
 */
 
-#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;
 
@@ -35,8 +35,8 @@ public:
        std::list<boost::shared_ptr<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