X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fsubrip_subtitle.h;h=d4d27e1400013865653395b0ddf6159cb74c0663;hb=9facdf75a2776319fc5826cfa3dd85340f3c8879;hp=dd46b6c6491584d4197e9b4ec4045f6aeda70798;hpb=cfdd68eb5fb0ef8423e860103ad4e5510994f1da;p=dcpomatic.git

diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h
index dd46b6c64..d4d27e140 100644
--- a/src/lib/subrip_subtitle.h
+++ b/src/lib/subrip_subtitle.h
@@ -20,10 +20,10 @@
 #ifndef DCPOMATIC_SUBRIP_SUBTITLE_H
 #define DCPOMATIC_SUBRIP_SUBTITLE_H
 
-#include <boost/optional.hpp>
-#include <dcp/types.h>
 #include "types.h"
 #include "dcpomatic_time.h"
+#include <dcp/types.h>
+#include <boost/optional.hpp>
 
 struct SubRipSubtitlePiece
 {
@@ -37,18 +37,12 @@ struct SubRipSubtitlePiece
 	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;