projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to tidy up internal APIs slightly.
[dcpomatic.git]
/
src
/
lib
/
player_video.h
diff --git
a/src/lib/player_video.h
b/src/lib/player_video.h
index 8bd1c7be30d4b2b40ca61103afdd423154fd009e..60c9224b0e5254978397e271fb1206584c970c68 100644
(file)
--- a/
src/lib/player_video.h
+++ b/
src/lib/player_video.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-2015 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/>.
*/
*/
@@
-40,7
+41,6
@@
class PlayerVideo
public:
PlayerVideo (
boost::shared_ptr<const ImageProxy>,
public:
PlayerVideo (
boost::shared_ptr<const ImageProxy>,
- DCPTime,
Crop,
boost::optional<double>,
dcp::Size,
Crop,
boost::optional<double>,
dcp::Size,
@@
-65,14
+65,14
@@
public:
bool has_j2k () const;
dcp::Data j2k () const;
bool has_j2k () const;
dcp::Data j2k () const;
- DCPTime time () const {
- return _time;
- }
-
Eyes eyes () const {
return _eyes;
}
Eyes eyes () const {
return _eyes;
}
+ void set_eyes (Eyes e) {
+ _eyes = e;
+ }
+
boost::optional<ColourConversion> colour_conversion () const {
return _colour_conversion;
}
boost::optional<ColourConversion> colour_conversion () const {
return _colour_conversion;
}
@@
-89,7
+89,6
@@
public:
private:
boost::shared_ptr<const ImageProxy> _in;
private:
boost::shared_ptr<const ImageProxy> _in;
- DCPTime _time;
Crop _crop;
boost::optional<double> _fade;
dcp::Size _inter_size;
Crop _crop;
boost::optional<double> _fade;
dcp::Size _inter_size;