X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip_subtitle.h;h=f39a317b72e4d890cc39c5d2d8989d30f9f34f17;hb=9bf2cf3509380663e6943f6b0d22dbec6002c332;hp=2af5f66aebb5c37150a7d94466ff206c040a6126;hpb=f58d9e44302151dea9f594acd9fc27a331fa77fb;p=dcpomatic.git

diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h
index 2af5f66ae..f39a317b7 100644
--- a/src/lib/subrip_subtitle.h
+++ b/src/lib/subrip_subtitle.h
@@ -20,9 +20,10 @@
 #ifndef DCPOMATIC_SUBRIP_SUBTITLE_H
 #define DCPOMATIC_SUBRIP_SUBTITLE_H
 
-#include <boost/optional.hpp>
-#include <libdcp/types.h>
 #include "types.h"
+#include "dcpomatic_time.h"
+#include <dcp/types.h>
+#include <boost/optional.hpp>
 
 struct SubRipSubtitlePiece
 {
@@ -31,23 +32,17 @@ struct SubRipSubtitlePiece
 		, italic (false)
 		, underline (false)
 	{}
-	
+
 	std::string text;
 	bool bold;
 	bool italic;
 	bool underline;
-	dcp::Color color;
+	dcp::Colour color;
 };
 
 struct SubRipSubtitle
 {
-	SubRipSubtitle ()
-		: from (0)
-		, to (0)
-	{}
-	
-	ContentTime from;
-	ContentTime to;
+	ContentTimePeriod period;
 	boost::optional<int> x1;
 	boost::optional<int> x2;
 	boost::optional<int> y1;