X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftext_content.h;h=5eda8764ffeaa91ea5c20758fb46c2cad71e1844;hp=83860dff54fb6f733356a30de07833b282a7d336;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=5aa057f73c9b5d0f2a4a1479bd75dee849250265

diff --git a/src/lib/text_content.h b/src/lib/text_content.h
index 83860dff5..5eda8764f 100644
--- a/src/lib/text_content.h
+++ b/src/lib/text_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,7 +27,9 @@
 #include <dcp/types.h>
 #include <boost/signals2.hpp>
 
-class Font;
+namespace dcpomatic {
+	class Font;
+}
 
 class TextContentProperty
 {
@@ -67,7 +69,7 @@ public:
 	std::string identifier () const;
 	void take_settings_from (boost::shared_ptr<const TextContent> c);
 
-	void add_font (boost::shared_ptr<Font> font);
+	void add_font (boost::shared_ptr<dcpomatic::Font> font);
 
 	void set_use (bool);
 	void set_burn (bool);
@@ -83,9 +85,9 @@ public:
 	void set_effect_colour (dcp::Colour);
 	void unset_effect_colour ();
 	void set_line_spacing (double s);
-	void set_fade_in (ContentTime);
+	void set_fade_in (dcpomatic::ContentTime);
 	void unset_fade_in ();
-	void set_fade_out (ContentTime);
+	void set_fade_out (dcpomatic::ContentTime);
 	void set_outline_width (int);
 	void unset_fade_out ();
 	void set_type (TextType type);
@@ -122,7 +124,7 @@ public:
 		return _y_scale;
 	}
 
-	std::list<boost::shared_ptr<Font> > fonts () const {
+	std::list<boost::shared_ptr<dcpomatic::Font> > fonts () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _fonts;
 	}
@@ -152,12 +154,12 @@ public:
 		return _line_spacing;
 	}
 
-	boost::optional<ContentTime> fade_in () const {
+	boost::optional<dcpomatic::ContentTime> fade_in () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _fade_in;
 	}
 
-	boost::optional<ContentTime> fade_out () const {
+	boost::optional<dcpomatic::ContentTime> fade_out () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _fade_out;
 	}
@@ -211,14 +213,14 @@ private:
 	double _x_scale;
 	/** y scale factor to apply to subtitles */
 	double _y_scale;
-	std::list<boost::shared_ptr<Font> > _fonts;
+	std::list<boost::shared_ptr<dcpomatic::Font> > _fonts;
 	boost::optional<dcp::Colour> _colour;
 	boost::optional<dcp::Effect> _effect;
 	boost::optional<dcp::Colour> _effect_colour;
 	/** scaling factor for line spacing; 1 is "standard", < 1 is closer together, > 1 is further apart */
 	double _line_spacing;
-	boost::optional<ContentTime> _fade_in;
-	boost::optional<ContentTime> _fade_out;
+	boost::optional<dcpomatic::ContentTime> _fade_in;
+	boost::optional<dcpomatic::ContentTime> _fade_out;
 	int _outline_width;
 	/** what these captions will be used for in the output DCP (not necessarily what
 	 *  they were originally).