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

diff --git a/src/lib/content_text.h b/src/lib/content_text.h
index 2d8910577..5edb9af20 100644
--- a/src/lib/content_text.h
+++ b/src/lib/content_text.h
@@ -33,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)
 	{}
@@ -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)
 	{}