projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
[dcpomatic.git]
/
src
/
lib
/
subrip_subtitle.h
diff --git
a/src/lib/subrip_subtitle.h
b/src/lib/subrip_subtitle.h
index 933e0fc021ab5fd8f1b4caeee91a8d75a35f5d12..646fc1f7aaec53c330733bd5fa36c44c81ab5780 100644
(file)
--- a/
src/lib/subrip_subtitle.h
+++ b/
src/lib/subrip_subtitle.h
@@
-21,8
+21,9
@@
#define DCPOMATIC_SUBRIP_SUBTITLE_H
#include <boost/optional.hpp>
#define DCPOMATIC_SUBRIP_SUBTITLE_H
#include <boost/optional.hpp>
-#include <
lib
dcp/types.h>
+#include <dcp/types.h>
#include "types.h"
#include "types.h"
+#include "dcpomatic_time.h"
struct SubRipSubtitlePiece
{
struct SubRipSubtitlePiece
{
@@
-36,18
+37,12
@@
struct SubRipSubtitlePiece
bool bold;
bool italic;
bool underline;
bool bold;
bool italic;
bool underline;
-
lib
dcp::Color color;
+ dcp::Color color;
};
struct SubRipSubtitle
{
};
struct SubRipSubtitle
{
- SubRipSubtitle ()
- : from (0)
- , to (0)
- {}
-
- Time from;
- Time 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;