d588620e70bf15da29cc242e4ae8d86977e8f36a from master; fix hang if you cancel a paused...

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

diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h
index 933e0fc021ab5fd8f1b4caeee91a8d75a35f5d12..d4d27e1400013865653395b0ddf6159cb74c0663 100644 (file)
--- 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
 {
@@ -36,18 +37,12 @@ struct SubRipSubtitlePiece
        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;