Hand-apply 63142d58947cf10ed6f6eaeb42508eaa374a6a93 from master; fix calls to new...

[dcpomatic.git] / src / lib / content_video.h

diff --git a/src/lib/content_video.h b/src/lib/content_video.h
index 96ce5450c2619f21a0213e18aa8624a110311906..a7f73597c866495b0df60a2f3036bd8066d0f1f0 100644 (file)
--- a/src/lib/content_video.h
+++ b/src/lib/content_video.h
@@ -17,6 +17,11 @@
 
 */
 
+#ifndef DCPOMATIC_CONTENT_VIDEO_H
+#define DCPOMATIC_CONTENT_VIDEO_H
+
+class ImageProxy;
+
 /** @class ContentVideo
  *  @brief A frame of video straight out of some content.
  */
@@ -27,13 +32,17 @@ 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;
 };
+
+#endif