X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_video.h;h=1c145f60294f4e7d1e1523cd8cf3abbe16eb12e5;hb=34520e2f149a82042a8dfc8835b097c6218c1a08;hp=ee169b6c556c93b93a7636f183314e56830ed17d;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/lib/content_video.h b/src/lib/content_video.h index ee169b6c5..1c145f602 100644 --- a/src/lib/content_video.h +++ b/src/lib/content_video.h @@ -18,13 +18,18 @@ */ + #ifndef DCPOMATIC_CONTENT_VIDEO_H #define DCPOMATIC_CONTENT_VIDEO_H + +#include "dcpomatic_time.h" #include "types.h" + class ImageProxy; + /** @class ContentVideo * @brief A frame of video straight out of some content. */ @@ -32,22 +37,22 @@ class ContentVideo { public: ContentVideo () - : frame (0) - , eyes (EYES_LEFT) - , part (PART_WHOLE) + : eyes (Eyes::LEFT) + , part (Part::WHOLE) {} - ContentVideo (std::shared_ptr i, Frame f, Eyes e, Part p) + ContentVideo (std::shared_ptr i, dcpomatic::ContentTime t, Eyes e, Part p) : image (i) - , frame (f) + , time (t) , eyes (e) , part (p) {} std::shared_ptr image; - Frame frame; + dcpomatic::ContentTime time; Eyes eyes; Part part; }; + #endif