X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip_subtitle.h;h=f39a317b72e4d890cc39c5d2d8989d30f9f34f17;hb=bb9d1f9e0f1aa818d1ac2145f05563e4c95d41b1;hp=933e0fc021ab5fd8f1b4caeee91a8d75a35f5d12;hpb=7e2cf1a4a04828b5a57d5eb6869475a819005602;p=dcpomatic.git

diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h
index 933e0fc02..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;
-	libdcp::Color color;
+	dcp::Colour color;
 };
 
 struct SubRipSubtitle
 {
-	SubRipSubtitle ()
-		: from (0)
-		, to (0)
-	{}
-	
-	Time from;
-	Time to;
+	ContentTimePeriod period;
 	boost::optional<int> x1;
 	boost::optional<int> x2;
 	boost::optional<int> y1;