projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename dcpomatic_sleep -> dcpomatic_sleep_seconds.
[dcpomatic.git]
/
src
/
lib
/
content_video.h
diff --git
a/src/lib/content_video.h
b/src/lib/content_video.h
index 20b5b8dec310a066eeb17e8c4a273ec32a826f2e..8b3d984df9f808db12448ad93e04fa7e1dafdb9d 100644
(file)
--- a/
src/lib/content_video.h
+++ b/
src/lib/content_video.h
@@
-1,26
+1,29
@@
/*
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/>.
*/
#ifndef DCPOMATIC_CONTENT_VIDEO_H
#define DCPOMATIC_CONTENT_VIDEO_H
*/
#ifndef DCPOMATIC_CONTENT_VIDEO_H
#define DCPOMATIC_CONTENT_VIDEO_H
-class Image;
+#include "types.h"
+
+class ImageProxy;
/** @class ContentVideo
* @brief A frame of video straight out of some content.
/** @class ContentVideo
* @brief A frame of video straight out of some content.
@@
-29,18
+32,22
@@
class ContentVideo
{
public:
ContentVideo ()
{
public:
ContentVideo ()
- : eyes (EYES_BOTH)
+ : frame (0)
+ , eyes (EYES_LEFT)
+ , part (PART_WHOLE)
{}
{}
- ContentVideo (boost::shared_ptr<const Image
> i, Eyes e, VideoFrame f
)
+ ContentVideo (boost::shared_ptr<const Image
Proxy> i, Frame f, Eyes e, Part p
)
: image (i)
: image (i)
- , eyes (e)
, frame (f)
, frame (f)
+ , eyes (e)
+ , part (p)
{}
{}
-
- boost::shared_ptr<const Image> image;
+
+ boost::shared_ptr<const ImageProxy> image;
+ Frame frame;
Eyes eyes;
Eyes eyes;
-
VideoFrame frame
;
+
Part part
;
};
#endif
};
#endif