projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some unused code.
[dcpomatic.git]
/
src
/
lib
/
content_subtitle.h
diff --git
a/src/lib/content_subtitle.h
b/src/lib/content_subtitle.h
index 8c0f29f4e29f0faaf453b41c957fc535684cc22a..8751d56cb58f512d971428176f1545d762963017 100644
(file)
--- a/
src/lib/content_subtitle.h
+++ b/
src/lib/content_subtitle.h
@@
-32,23
+32,23
@@
class Image;
class ContentSubtitle
{
public:
class ContentSubtitle
{
public:
- ContentSubtitle (ContentTime
Period p
)
- : _
period (p
)
+ ContentSubtitle (ContentTime
f
)
+ : _
from (f
)
{}
{}
- ContentTime
Period period
() const {
- return _
period
;
+ ContentTime
from
() const {
+ return _
from
;
}
private:
}
private:
- ContentTime
Period _period
;
+ ContentTime
_from
;
};
class ContentImageSubtitle : public ContentSubtitle
{
public:
};
class ContentImageSubtitle : public ContentSubtitle
{
public:
- ContentImageSubtitle (ContentTime
Period 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)
{}
, sub (im, r)
{}
@@
-63,8
+63,8
@@
public:
class ContentTextSubtitle : public ContentSubtitle
{
public:
class ContentTextSubtitle : public ContentSubtitle
{
public:
- ContentTextSubtitle (ContentTime
Period p
, std::list<dcp::SubtitleString> s)
- : ContentSubtitle (
p
)
+ ContentTextSubtitle (ContentTime
f
, std::list<dcp::SubtitleString> s)
+ : ContentSubtitle (
f
)
, subs (s)
{}
, subs (s)
{}