projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
content_subtitle.h
diff --git
a/src/lib/content_subtitle.h
b/src/lib/content_subtitle.h
index 8c266f4835da680495a3f07414d98b65935e54bc..6a28c37bf2c79b19eb3ffde4040f66559c6b277a 100644
(file)
--- a/
src/lib/content_subtitle.h
+++ b/
src/lib/content_subtitle.h
@@
-30,34
+30,27
@@
class Image;
class ContentSubtitle
{
public:
class ContentSubtitle
{
public:
- virtual ContentTime from () const = 0;
- virtual ContentTime to () const = 0;
+ virtual ContentTimePeriod period () const = 0;
};
class ContentImageSubtitle : public ContentSubtitle
{
public:
};
class ContentImageSubtitle : public ContentSubtitle
{
public:
- ContentImageSubtitle (ContentTime
f, ContentTime t
, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+ ContentImageSubtitle (ContentTime
Period p
, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
: image (im)
, rectangle (r)
: image (im)
, rectangle (r)
- , _from (f)
- , _to (t)
+ , _period (p)
{}
{}
- ContentTime
from
() const {
- return _
from
;
+ ContentTime
Period period
() const {
+ return _
period
;
}
}
- ContentTime to () const {
- return _to;
- }
-
boost::shared_ptr<Image> image;
dcpomatic::Rect<double> rectangle;
private:
boost::shared_ptr<Image> image;
dcpomatic::Rect<double> rectangle;
private:
- ContentTime _from;
- ContentTime _to;
+ ContentTimePeriod _period;
};
class ContentTextSubtitle : public ContentSubtitle
};
class ContentTextSubtitle : public ContentSubtitle
@@
-67,8
+60,7
@@
public:
: subs (s)
{}
: subs (s)
{}
- ContentTime from () const;
- ContentTime to () const;
+ ContentTimePeriod period () const;
std::list<dcp::SubtitleString> subs;
};
std::list<dcp::SubtitleString> subs;
};