Allow ContentBitmapText to contain multiple BitmapText objects.

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

diff --git a/src/lib/content_text.h b/src/lib/content_text.h
index 2d8910577926c38bd259b1e10a7a7c82c90f356d..fb86bc78637b599b7ff820b583583c0b324c7e2f 100644 (file)
--- a/src/lib/content_text.h
+++ b/src/lib/content_text.h
@@ -33,28 +33,28 @@ class Image;
 class ContentText
 {
 public:
-       explicit ContentText (ContentTime f)
+       explicit ContentText (dcpomatic::ContentTime f)
                : _from (f)
        {}
 
-       ContentTime from () const {
+       dcpomatic::ContentTime from () const {
                return _from;
        }
 
 private:
-       ContentTime _from;
+       dcpomatic::ContentTime _from;
 };
 
 class ContentBitmapText : public ContentText
 {
 public:
-       ContentBitmapText (ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+       ContentBitmapText (dcpomatic::ContentTime f, std::shared_ptr<const Image> im, dcpomatic::Rect<double> r)
                : ContentText (f)
-               , sub (im, r)
+               , subs{ {im, r} }
        {}
 
-       /* Our text, with its rectangle unmodified by any offsets or scales that the content specifies */
-       BitmapText sub;
+       /* Our texts, with their rectangles unmodified by any offsets or scales that the content specifies */
+       std::vector<BitmapText> subs;
 };
 
 /** A text caption.  We store the time period separately (as well as in the dcp::SubtitleStrings)
@@ -64,7 +64,7 @@ public:
 class ContentStringText : public ContentText
 {
 public:
-       ContentStringText (ContentTime f, std::list<dcp::SubtitleString> s)
+       ContentStringText (dcpomatic::ContentTime f, std::list<dcp::SubtitleString> s)
                : ContentText (f)
                , subs (s)
        {}