projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
lib
/
content_video.h
diff --git
a/src/lib/content_video.h
b/src/lib/content_video.h
index a7f73597c866495b0df60a2f3036bd8066d0f1f0..21a600709e9076e802c944c366a6fe9bbb68f54b 100644
(file)
--- a/
src/lib/content_video.h
+++ b/
src/lib/content_video.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-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/>.
*/
*/
@@
-30,19
+31,21
@@
class ContentVideo
public:
ContentVideo ()
: eyes (EYES_BOTH)
public:
ContentVideo ()
: eyes (EYES_BOTH)
+ , part (PART_WHOLE)
+ , frame (0)
{}
{}
- ContentVideo (boost::shared_ptr<const ImageProxy> i, Eyes e, Part p,
Video
Frame f)
+ ContentVideo (boost::shared_ptr<const ImageProxy> i, Eyes e, Part p, Frame f)
: image (i)
, eyes (e)
, part (p)
, frame (f)
{}
: image (i)
, eyes (e)
, part (p)
, frame (f)
{}
-
+
boost::shared_ptr<const ImageProxy> image;
Eyes eyes;
Part part;
boost::shared_ptr<const ImageProxy> image;
Eyes eyes;
Part part;
-
Video
Frame frame;
+ Frame frame;
};
#endif
};
#endif