projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a load of explicit keywords.
[dcpomatic.git]
/
src
/
lib
/
content_subtitle.h
diff --git
a/src/lib/content_subtitle.h
b/src/lib/content_subtitle.h
index 3c0ce523e8497e969836cf0305957fc323f2c46e..f834fe197c202eba95fb2f78d26d01dae4412527 100644
(file)
--- a/
src/lib/content_subtitle.h
+++ b/
src/lib/content_subtitle.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-31,23
+32,23
@@
class Image;
class ContentSubtitle
{
public:
class ContentSubtitle
{
public:
-
ContentSubtitle (ContentTimePeriod p
)
- : _
period (p
)
+
explicit 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)
{}
@@
-62,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)
{}