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 8c266f4835da680495a3f07414d98b65935e54bc..3c0ce523e8497e969836cf0305957fc323f2c46e 100644 (file)
--- a/src/lib/content_subtitle.h
+++ b/src/lib/content_subtitle.h
@@ -20,56 +20,53 @@
 #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;
 
 class ContentSubtitle
 {
 public:
-       virtual ContentTime from () const = 0;
-       virtual ContentTime to () const = 0;
+       ContentSubtitle (ContentTimePeriod p)
+               : _period (p)
+       {}
+
+       ContentTimePeriod period () const {
+               return _period;
+       }
+
+private:
+       ContentTimePeriod _period;
 };
 
 class ContentImageSubtitle : public ContentSubtitle
 {
 public:
-       ContentImageSubtitle (ContentTime f, ContentTime t, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
-               : image (im)
-               , rectangle (r)
-               , _from (f)
-               , _to (t)
+       ContentImageSubtitle (ContentTimePeriod p, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+               : ContentSubtitle (p)
+               , sub (im, r)
        {}
 
-       ContentTime from () const {
-               return _from;
-       }
-
-       ContentTime to () const {
-               return _to;
-       }
-       
-       boost::shared_ptr<Image> image;
-       dcpomatic::Rect<double> rectangle;
-
-private:
-       ContentTime _from;
-       ContentTime _to;
+       /* Our subtitle, with its rectangle unmodified by any offsets or scales that the content specifies */
+       ImageSubtitle sub;
 };
 
+/** 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)
        {}
 
-       ContentTime from () const;
-       ContentTime to () const;
-       
        std::list<dcp::SubtitleString> subs;
 };