Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert...

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

diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h
index dd46b6c6491584d4197e9b4ec4045f6aeda70798..6fd0bdf74da490cab2fdbc63689e3a6ff35d7c11 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
 {
@@ -42,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;