X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_video.h;h=8b3d984df9f808db12448ad93e04fa7e1dafdb9d;hb=73713b742a2be95ea736d2d3d889f5b535a0f0f1;hp=8e5f2fd094d408d6433fb012c3a3a35385c9375c;hpb=4b7b0edb359ae68f2dbcab90c7c10382f507fa5b;p=dcpomatic.git diff --git a/src/lib/content_video.h b/src/lib/content_video.h index 8e5f2fd09..8b3d984df 100644 --- 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 -#include "video_frame.h" +#include "types.h" class ImageProxy; @@ -32,17 +32,21 @@ class ContentVideo { public: ContentVideo () - : part (PART_WHOLE) + : frame (0) + , eyes (EYES_LEFT) + , part (PART_WHOLE) {} - ContentVideo (boost::shared_ptr i, VideoFrame f, Part p) + ContentVideo (boost::shared_ptr i, Frame f, Eyes e, Part p) : image (i) , frame (f) + , eyes (e) , part (p) {} boost::shared_ptr image; - VideoFrame frame; + Frame frame; + Eyes eyes; Part part; };