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 646fc1f7aaec53c330733bd5fa36c44c81ab5780..f39a317b72e4d890cc39c5d2d8989d30f9f34f17 100644 (file)
--- a/src/lib/subrip_subtitle.h
+++ b/src/lib/subrip_subtitle.h
@@ -20,10 +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
 {
@@ -32,12 +32,12 @@ struct SubRipSubtitlePiece
                , italic (false)
                , underline (false)
        {}
-       
+
        std::string text;
        bool bold;
        bool italic;
        bool underline;
-       dcp::Color color;
+       dcp::Colour color;
 };
 
 struct SubRipSubtitle