More renaming.

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

diff --git a/src/lib/player_subtitles.h b/src/lib/player_subtitles.h
index 9e50ea7776c961ba86f3446438e7a131c4ac9f08..4e3a739d8b1990941a6a9b54093bd9c5b85f3810 100644 (file)
--- a/src/lib/player_subtitles.h
+++ b/src/lib/player_subtitles.h
@@ -21,27 +21,22 @@
 #ifndef DCPOMATIC_PLAYER_SUBTITLES_H
 #define DCPOMATIC_PLAYER_SUBTITLES_H
 
-#include "image_subtitle.h"
+#include "bitmap_text.h"
 #include "dcpomatic_time.h"
-#include <dcp/subtitle_string.h>
+#include "subtitle_string.h"
 
 class Font;
 
+/** A set of subtitles which span the same time period */
 class PlayerSubtitles
 {
 public:
-       PlayerSubtitles (DCPTime f)
-               : from (f)
-       {}
-
        void add_fonts (std::list<boost::shared_ptr<Font> > fonts_);
-
-       DCPTime from;
        std::list<boost::shared_ptr<Font> > fonts;
 
-       /** ImageSubtitles, with their rectangles transformed as specified by their content */
-       std::list<ImageSubtitle> image;
-       std::list<dcp::SubtitleString> text;
+       /** BitmapTexts, with their rectangles transformed as specified by their content */
+       std::list<BitmapText> image;
+       std::list<SubtitleString> text;
 };
 
 #endif