X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_video.h;h=8ca18576e4e939f9c7b469924b6f5e63e89a8d10;hb=7bc591abc86ed4742f21f45ca1d6151cb14bc100;hp=21a600709e9076e802c944c366a6fe9bbb68f54b;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/content_video.h b/src/lib/content_video.h index 21a600709..8ca18576e 100644 --- a/src/lib/content_video.h +++ b/src/lib/content_video.h @@ -21,6 +21,8 @@ #ifndef DCPOMATIC_CONTENT_VIDEO_H #define DCPOMATIC_CONTENT_VIDEO_H +#include "types.h" + class ImageProxy; /** @class ContentVideo @@ -30,22 +32,22 @@ class ContentVideo { public: ContentVideo () - : eyes (EYES_BOTH) - , part (PART_WHOLE) - , frame (0) + : frame (0) + , eyes (Eyes::LEFT) + , part (Part::WHOLE) {} - ContentVideo (boost::shared_ptr i, Eyes e, Part p, Frame f) + ContentVideo (std::shared_ptr i, Frame f, Eyes e, Part p) : image (i) + , frame (f) , eyes (e) , part (p) - , frame (f) {} - boost::shared_ptr image; + std::shared_ptr image; + Frame frame; Eyes eyes; Part part; - Frame frame; }; #endif