diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-20 13:23:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-20 13:23:26 +0100 |
| commit | 39bc73fe192f932ed6695eb87b19de446e8b4f55 (patch) | |
| tree | 4811b0642b7fcd73206b037da4ffb342e90ce6dc /src/lib/content_video.h | |
| parent | bb0a36c3a6bea9cd1ebdde7b8a3a04765e317569 (diff) | |
| parent | 884093edac5f63d26c02d411c73dfb52376ccf8f (diff) | |
Merge master.
Diffstat (limited to 'src/lib/content_video.h')
| -rw-r--r-- | src/lib/content_video.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/content_video.h b/src/lib/content_video.h index 20b5b8dec..a7f73597c 100644 --- 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 -class Image; +class ImageProxy; /** @class ContentVideo * @brief A frame of video straight out of some content. @@ -32,14 +32,16 @@ public: : eyes (EYES_BOTH) {} - ContentVideo (boost::shared_ptr<const Image> i, Eyes e, VideoFrame f) + ContentVideo (boost::shared_ptr<const ImageProxy> i, Eyes e, Part p, VideoFrame f) : image (i) , eyes (e) + , part (p) , frame (f) {} - boost::shared_ptr<const Image> image; + boost::shared_ptr<const ImageProxy> image; Eyes eyes; + Part part; VideoFrame frame; }; |