projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
src
/
lib
/
subrip_subtitle.h
diff --git
a/src/lib/subrip_subtitle.h
b/src/lib/subrip_subtitle.h
index 933e0fc021ab5fd8f1b4caeee91a8d75a35f5d12..f39a317b72e4d890cc39c5d2d8989d30f9f34f17 100644
(file)
--- a/
src/lib/subrip_subtitle.h
+++ b/
src/lib/subrip_subtitle.h
@@
-20,9
+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 <libdcp/types.h>
#include "types.h"
#include "types.h"
+#include "dcpomatic_time.h"
+#include <dcp/types.h>
+#include <boost/optional.hpp>
struct SubRipSubtitlePiece
{
struct SubRipSubtitlePiece
{
@@
-31,23
+32,17
@@
struct SubRipSubtitlePiece
, italic (false)
, underline (false)
{}
, italic (false)
, underline (false)
{}
-
+
std::string text;
bool bold;
bool italic;
bool underline;
std::string text;
bool bold;
bool italic;
bool underline;
-
libdcp::Colo
r color;
+
dcp::Colou
r 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;