Rearrange subtitle font management.

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

diff --git a/src/lib/content_text.h b/src/lib/content_text.h
index 438a76a6e17870fe2b7f52e4a52d51515c71125a..06fb39cfce6c423166c465a07d4d59af5367ef7e 100644 (file)
--- a/src/lib/content_text.h
+++ b/src/lib/content_text.h
@@ -18,18 +18,23 @@
 
 */
 
+
 #ifndef DCPOMATIC_CONTENT_TEXT_H
 #define DCPOMATIC_CONTENT_TEXT_H
 
+
+#include "bitmap_text.h"
 #include "dcpomatic_time.h"
 #include "rect.h"
+#include "string_text.h"
 #include "types.h"
-#include "bitmap_text.h"
 #include <dcp/subtitle_string.h>
-#include <list>
+#include <vector>
+
 
 class Image;
 
+
 class ContentText
 {
 public:
@@ -70,12 +75,13 @@ public:
 class ContentStringText : public ContentText
 {
 public:
-       ContentStringText (dcpomatic::ContentTime f, std::list<dcp::SubtitleString> s)
+       ContentStringText (dcpomatic::ContentTime f, std::vector<StringText> s)
                : ContentText (f)
                , subs (s)
        {}
 
-       std::list<dcp::SubtitleString> subs;
+       std::vector<StringText> subs;
 };
 
+
 #endif