X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_text.h;h=0c0df1ee63bdce15f3c5d9905af302c31a10c43d;hb=895b386b6751afd3d068155f4ea71e762297672a;hp=3ef011f61173eefed1902a3a6fd7ae521016772a;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/lib/content_text.h b/src/lib/content_text.h
index 3ef011f61..0c0df1ee6 100644
--- a/src/lib/content_text.h
+++ b/src/lib/content_text.h
@@ -33,29 +33,23 @@ class Image;
 class ContentText
 {
 public:
-	explicit ContentText (ContentTime f, TextType t)
+	explicit ContentText (dcpomatic::ContentTime f)
 		: _from (f)
-		, _type (t)
 	{}
 
-	ContentTime from () const {
+	dcpomatic::ContentTime from () const {
 		return _from;
 	}
 
-	TextType type () const {
-		return _type;
-	}
-
 private:
-	ContentTime _from;
-	TextType _type;
+	dcpomatic::ContentTime _from;
 };
 
 class ContentBitmapText : public ContentText
 {
 public:
-	ContentBitmapText (ContentTime f, TextType type, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
-		: ContentText (f, type)
+	ContentBitmapText (dcpomatic::ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+		: ContentText (f)
 		, sub (im, r)
 	{}
 
@@ -70,8 +64,8 @@ public:
 class ContentStringText : public ContentText
 {
 public:
-	ContentStringText (ContentTime f, TextType type, std::list<dcp::SubtitleString> s)
-		: ContentText (f, type)
+	ContentStringText (dcpomatic::ContentTime f, std::list<dcp::SubtitleString> s)
+		: ContentText (f)
 		, subs (s)
 	{}