Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h
index 25ba7592c5a8492a104c1f8e433a23246ae46510..f39a317b72e4d890cc39c5d2d8989d30f9f34f17 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 <dcp/types.h>
 #include "types.h"
+#include "dcpomatic_time.h"
+#include <dcp/types.h>
+#include <boost/optional.hpp>
 
 struct SubRipSubtitlePiece
 {
@@ -31,23 +32,17 @@ struct SubRipSubtitlePiece
                , italic (false)
                , underline (false)
        {}
-       
+
        std::string text;
        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;