projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply 63142d58947cf10ed6f6eaeb42508eaa374a6a93 from master; fix calls to new...
[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
#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 "types.h"
#include "dcpomatic_time.h"
+#include <dcp/types.h>
+#include <boost/optional.hpp>
struct SubRipSubtitlePiece
{
struct SubRipSubtitlePiece
{
@@
-42,13
+42,7
@@
struct SubRipSubtitlePiece
struct SubRipSubtitle
{
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;
boost::optional<int> x1;
boost::optional<int> x2;
boost::optional<int> y1;