Merge branch 'master' into 2.0

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

diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h
index 933e0fc021ab5fd8f1b4caeee91a8d75a35f5d12..25ba7592c5a8492a104c1f8e433a23246ae46510 100644 (file)
--- a/src/lib/subrip_subtitle.h
+++ b/src/lib/subrip_subtitle.h
@@ -21,7 +21,7 @@
 #define DCPOMATIC_SUBRIP_SUBTITLE_H
 
 #include <boost/optional.hpp>
-#include <libdcp/types.h>
+#include <dcp/types.h>
 #include "types.h"
 
 struct SubRipSubtitlePiece
@@ -36,7 +36,7 @@ struct SubRipSubtitlePiece
        bool bold;
        bool italic;
        bool underline;
-       libdcp::Color color;
+       dcp::Color color;
 };
 
 struct SubRipSubtitle
@@ -46,8 +46,8 @@ struct SubRipSubtitle
                , to (0)
        {}
        
-       Time from;
-       Time to;
+       ContentTime from;
+       ContentTime to;
        boost::optional<int> x1;
        boost::optional<int> x2;
        boost::optional<int> y1;