Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/content_subtitle.h b/src/lib/content_subtitle.h
index ef904a9805e50476b064b7cdc589290694ff7777..3c0ce523e8497e969836cf0305957fc323f2c46e 100644 (file)
--- a/src/lib/content_subtitle.h
+++ b/src/lib/content_subtitle.h
@@ -31,37 +31,42 @@ class Image;
 class ContentSubtitle
 {
 public:
-       virtual ContentTimePeriod period () const = 0;
+       ContentSubtitle (ContentTimePeriod p)
+               : _period (p)
+       {}
+
+       ContentTimePeriod period () const {
+               return _period;
+       }
+
+private:
+       ContentTimePeriod _period;
 };
 
 class ContentImageSubtitle : public ContentSubtitle
 {
 public:
        ContentImageSubtitle (ContentTimePeriod p, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
-               : sub (im, r)
-               , _period (p)
+               : ContentSubtitle (p)
+               , sub (im, r)
        {}
 
-       ContentTimePeriod period () const {
-               return _period;
-       }
-
        /* Our subtitle, with its rectangle unmodified by any offsets or scales that the content specifies */
        ImageSubtitle sub;
-
-private:
-       ContentTimePeriod _period;
 };
 
+/** A text subtitle.  We store the time period separately (as well as in the dcp::SubtitleStrings)
+ *  as the dcp::SubtitleString timings are sometimes quite heavily quantised and this causes problems
+ *  when we want to compare the quantised periods to the unquantised ones.
+ */
 class ContentTextSubtitle : public ContentSubtitle
 {
 public:
-       ContentTextSubtitle (std::list<dcp::SubtitleString> s)
-               : subs (s)
+       ContentTextSubtitle (ContentTimePeriod p, std::list<dcp::SubtitleString> s)
+               : ContentSubtitle (p)
+               , subs (s)
        {}
 
-       ContentTimePeriod period () const;
-
        std::list<dcp::SubtitleString> subs;
 };