No-op: remove all trailing whitespace.

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

diff --git a/src/lib/content_subtitle.h b/src/lib/content_subtitle.h
index 6a28c37bf2c79b19eb3ffde4040f66559c6b277a..ef904a9805e50476b064b7cdc589290694ff7777 100644 (file)
--- a/src/lib/content_subtitle.h
+++ b/src/lib/content_subtitle.h
@@ -20,10 +20,11 @@
 #ifndef DCPOMATIC_CONTENT_SUBTITLE_H
 #define DCPOMATIC_CONTENT_SUBTITLE_H
 
-#include <list>
-#include <dcp/subtitle_string.h>
 #include "dcpomatic_time.h"
 #include "rect.h"
+#include "image_subtitle.h"
+#include <dcp/subtitle_string.h>
+#include <list>
 
 class Image;
 
@@ -37,8 +38,7 @@ class ContentImageSubtitle : public ContentSubtitle
 {
 public:
        ContentImageSubtitle (ContentTimePeriod p, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
-               : image (im)
-               , rectangle (r)
+               : sub (im, r)
                , _period (p)
        {}
 
@@ -46,8 +46,8 @@ public:
                return _period;
        }
 
-       boost::shared_ptr<Image> image;
-       dcpomatic::Rect<double> rectangle;
+       /* Our subtitle, with its rectangle unmodified by any offsets or scales that the content specifies */
+       ImageSubtitle sub;
 
 private:
        ContentTimePeriod _period;
@@ -61,7 +61,7 @@ public:
        {}
 
        ContentTimePeriod period () const;
-       
+
        std::list<dcp::SubtitleString> subs;
 };