summaryrefslogtreecommitdiff
path: root/src/lib/content_subtitle.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-04-26 15:29:21 +0100
committerCarl Hetherington <cth@carlh.net>2017-04-27 10:55:07 +0100
commitba8a5a15cc27988e2bbc6acd470d8532f1d8e99f (patch)
tree375bd068bbd86760f85fcd1264c1d8d76f2f1240 /src/lib/content_subtitle.h
parentf5a2789fcab274f2beda4a1e4ff59567158c9686 (diff)
Initial work on removing storage of subtitle times.
Diffstat (limited to 'src/lib/content_subtitle.h')
-rw-r--r--src/lib/content_subtitle.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/content_subtitle.h b/src/lib/content_subtitle.h
index 8c0f29f4e..8751d56cb 100644
--- a/src/lib/content_subtitle.h
+++ b/src/lib/content_subtitle.h
@@ -32,23 +32,23 @@ class Image;
class ContentSubtitle
{
public:
- ContentSubtitle (ContentTimePeriod p)
- : _period (p)
+ ContentSubtitle (ContentTime f)
+ : _from (f)
{}
- ContentTimePeriod period () const {
- return _period;
+ ContentTime from () const {
+ return _from;
}
private:
- ContentTimePeriod _period;
+ ContentTime _from;
};
class ContentImageSubtitle : public ContentSubtitle
{
public:
- ContentImageSubtitle (ContentTimePeriod p, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
- : ContentSubtitle (p)
+ ContentImageSubtitle (ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+ : ContentSubtitle (f)
, sub (im, r)
{}
@@ -63,8 +63,8 @@ public:
class ContentTextSubtitle : public ContentSubtitle
{
public:
- ContentTextSubtitle (ContentTimePeriod p, std::list<dcp::SubtitleString> s)
- : ContentSubtitle (p)
+ ContentTextSubtitle (ContentTime f, std::list<dcp::SubtitleString> s)
+ : ContentSubtitle (f)
, subs (s)
{}