projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add config option for default KDM type.
[dcpomatic.git]
/
src
/
lib
/
content_video.h
diff --git
a/src/lib/content_video.h
b/src/lib/content_video.h
index 8e5f2fd094d408d6433fb012c3a3a35385c9375c..8ca18576e4e939f9c7b469924b6f5e63e89a8d10 100644
(file)
--- a/
src/lib/content_video.h
+++ b/
src/lib/content_video.h
@@
-21,7
+21,7
@@
#ifndef DCPOMATIC_CONTENT_VIDEO_H
#define DCPOMATIC_CONTENT_VIDEO_H
#ifndef DCPOMATIC_CONTENT_VIDEO_H
#define DCPOMATIC_CONTENT_VIDEO_H
-#include "
video_frame
.h"
+#include "
types
.h"
class ImageProxy;
class ImageProxy;
@@
-32,17
+32,21
@@
class ContentVideo
{
public:
ContentVideo ()
{
public:
ContentVideo ()
- : part (PART_WHOLE)
+ : frame (0)
+ , eyes (Eyes::LEFT)
+ , part (Part::WHOLE)
{}
{}
- ContentVideo (
boost::shared_ptr<const ImageProxy> i, VideoFrame f
, Part p)
+ ContentVideo (
std::shared_ptr<const ImageProxy> i, Frame f, Eyes e
, Part p)
: image (i)
, frame (f)
: image (i)
, frame (f)
+ , eyes (e)
, part (p)
{}
, part (p)
{}
- boost::shared_ptr<const ImageProxy> image;
- VideoFrame frame;
+ std::shared_ptr<const ImageProxy> image;
+ Frame frame;
+ Eyes eyes;
Part part;
};
Part part;
};