Merge master.

[dcpomatic.git] / src / lib / subrip_subtitle.h

diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h
index f730ee492242ca3696731ee4230191da0f837f4c..646fc1f7aaec53c330733bd5fa36c44c81ab5780 100644 (file)
--- a/src/lib/subrip_subtitle.h
+++ b/src/lib/subrip_subtitle.h
@@ -21,8 +21,9 @@
 #define DCPOMATIC_SUBRIP_SUBTITLE_H
 
 #include <boost/optional.hpp>
-#include <libdcp/types.h>
+#include <dcp/types.h>
 #include "types.h"
+#include "dcpomatic_time.h"
 
 struct SubRipSubtitlePiece
 {
@@ -36,18 +37,12 @@ struct SubRipSubtitlePiece
        bool bold;
        bool italic;
        bool underline;
-       libdcp::Color color;
+       dcp::Color 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;