Merge master.

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

diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h
index 25ba7592c5a8492a104c1f8e433a23246ae46510..646fc1f7aaec53c330733bd5fa36c44c81ab5780 100644 (file)
--- a/src/lib/subrip_subtitle.h
+++ b/src/lib/subrip_subtitle.h
@@ -23,6 +23,7 @@
 #include <boost/optional.hpp>
 #include <dcp/types.h>
 #include "types.h"
+#include "dcpomatic_time.h"
 
 struct SubRipSubtitlePiece
 {
@@ -41,13 +42,7 @@ struct SubRipSubtitlePiece
 
 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;