From c4403784febdbdd42e9c32e67fadb147f11fe566 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 8 May 2019 23:41:42 +0100
Subject: Put Time types in dcpomatic namespace.

---
 src/lib/active_text.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/lib/active_text.h')

diff --git a/src/lib/active_text.h b/src/lib/active_text.h
index ff4a1bd2f..90b6b533b 100644
--- a/src/lib/active_text.h
+++ b/src/lib/active_text.h
@@ -37,11 +37,11 @@ class TextContent;
 class ActiveText : public boost::noncopyable
 {
 public:
-	std::list<PlayerText> get_burnt (DCPTimePeriod period, bool always_burn_captions) const;
-	void clear_before (DCPTime time);
+	std::list<PlayerText> get_burnt (dcpomatic::DCPTimePeriod period, bool always_burn_captions) const;
+	void clear_before (dcpomatic::DCPTime time);
 	void clear ();
-	void add_from (boost::weak_ptr<const TextContent> content, PlayerText ps, DCPTime from);
-	std::pair<PlayerText, DCPTime> add_to (boost::weak_ptr<const TextContent> content, DCPTime to);
+	void add_from (boost::weak_ptr<const TextContent> content, PlayerText ps, dcpomatic::DCPTime from);
+	std::pair<PlayerText, dcpomatic::DCPTime> add_to (boost::weak_ptr<const TextContent> content, dcpomatic::DCPTime to);
 	bool have (boost::weak_ptr<const TextContent> content) const;
 
 private:
@@ -50,14 +50,14 @@ private:
 	public:
 		Period () {}
 
-		Period (PlayerText s, DCPTime f)
+		Period (PlayerText s, dcpomatic::DCPTime f)
 			: subs (s)
 			, from (f)
 		{}
 
 		PlayerText subs;
-		DCPTime from;
-		boost::optional<DCPTime> to;
+		dcpomatic::DCPTime from;
+		boost::optional<dcpomatic::DCPTime> to;
 	};
 
 	typedef std::map<boost::weak_ptr<const TextContent>, std::list<Period> > Map;
-- 
cgit v1.2.3