X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip_subtitle.h;h=646fc1f7aaec53c330733bd5fa36c44c81ab5780;hb=bde76c3341775bd02da59932d285e14eade64ae0;hp=f730ee492242ca3696731ee4230191da0f837f4c;hpb=8353a009aae1a604251c0160193c39741c2fa27c;p=dcpomatic.git diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h index f730ee492..646fc1f7a 100644 --- a/src/lib/subrip_subtitle.h +++ b/src/lib/subrip_subtitle.h @@ -21,8 +21,9 @@ #define DCPOMATIC_SUBRIP_SUBTITLE_H #include -#include +#include #include "types.h" +#include "dcpomatic_time.h" struct SubRipSubtitlePiece { @@ -36,18 +37,12 @@ struct SubRipSubtitlePiece bool bold; bool italic; bool underline; - libdcp::Color color; + dcp::Color color; }; struct SubRipSubtitle { - SubRipSubtitle () - : from (0) - , to (0) - {} - - ContentTime from; - ContentTime to; + ContentTimePeriod period; boost::optional x1; boost::optional x2; boost::optional y1;