projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
content_video.h
diff --git
a/src/lib/content_video.h
b/src/lib/content_video.h
index 20b5b8dec310a066eeb17e8c4a273ec32a826f2e..a7f73597c866495b0df60a2f3036bd8066d0f1f0 100644
(file)
--- a/
src/lib/content_video.h
+++ b/
src/lib/content_video.h
@@
-20,7
+20,7
@@
#ifndef DCPOMATIC_CONTENT_VIDEO_H
#define DCPOMATIC_CONTENT_VIDEO_H
#ifndef DCPOMATIC_CONTENT_VIDEO_H
#define DCPOMATIC_CONTENT_VIDEO_H
-class Image;
+class Image
Proxy
;
/** @class ContentVideo
* @brief A frame of video straight out of some content.
/** @class ContentVideo
* @brief A frame of video straight out of some content.
@@
-32,14
+32,16
@@
public:
: eyes (EYES_BOTH)
{}
: eyes (EYES_BOTH)
{}
- ContentVideo (boost::shared_ptr<const Image
> i, Eyes e
, VideoFrame f)
+ ContentVideo (boost::shared_ptr<const Image
Proxy> i, Eyes e, Part p
, VideoFrame f)
: image (i)
, eyes (e)
: image (i)
, eyes (e)
+ , part (p)
, frame (f)
{}
, frame (f)
{}
- boost::shared_ptr<const Image> image;
+ boost::shared_ptr<const Image
Proxy
> image;
Eyes eyes;
Eyes eyes;
+ Part part;
VideoFrame frame;
};
VideoFrame frame;
};