X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_text.h;h=5edb9af2083be0993339caefa876dc09e3627e7d;hb=c59981ce92898f6be6987f10ebb29161e36e6766;hp=17ec579dfb93685d3195414878bdb2f20485871b;hpb=2dfe601447c5f2a7d00abd605f171c96f61ae707;p=dcpomatic.git

diff --git a/src/lib/content_text.h b/src/lib/content_text.h
index 17ec579df..5edb9af20 100644
--- a/src/lib/content_text.h
+++ b/src/lib/content_text.h
@@ -23,6 +23,7 @@
 
 #include "dcpomatic_time.h"
 #include "rect.h"
+#include "types.h"
 #include "bitmap_text.h"
 #include <dcp/subtitle_string.h>
 #include <list>
@@ -32,22 +33,22 @@ 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)
 	{}
@@ -56,14 +57,14 @@ public:
 	BitmapText sub;
 };
 
-/** A text subtitle.  We store the time period separately (as well as in the dcp::SubtitleStrings)
+/** A text caption.  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 ContentPlainText : public ContentText
+class ContentStringText : public ContentText
 {
 public:
-	ContentPlainText (ContentTime f, std::list<dcp::SubtitleString> s)
+	ContentStringText (dcpomatic::ContentTime f, std::list<dcp::SubtitleString> s)
 		: ContentText (f)
 		, subs (s)
 	{}