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..dd46b6c6491584d4197e9b4ec4045f6aeda70798 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,7 +37,7 @@ struct SubRipSubtitlePiece
        bool bold;
        bool italic;
        bool underline;
-       libdcp::Color color;
+       dcp::Color color;
 };
 
 struct SubRipSubtitle