Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/content_video.h b/src/lib/content_video.h
index 8e5f2fd094d408d6433fb012c3a3a35385c9375c..f59e99cfc65cd25cbbe57552a17648841c06527c 100644 (file)
--- a/src/lib/content_video.h
+++ b/src/lib/content_video.h
@@ -21,8 +21,6 @@
 #ifndef DCPOMATIC_CONTENT_VIDEO_H
 #define DCPOMATIC_CONTENT_VIDEO_H
 
-#include "video_frame.h"
-
 class ImageProxy;
 
 /** @class ContentVideo
@@ -32,17 +30,21 @@ class ContentVideo
 {
 public:
        ContentVideo ()
-               : part (PART_WHOLE)
+               : frame (0)
+               , eyes (EYES_LEFT)
+               , part (PART_WHOLE)
        {}
 
-       ContentVideo (boost::shared_ptr<const ImageProxy> i, VideoFrame f, Part p)
+       ContentVideo (boost::shared_ptr<const ImageProxy> i, Frame f, Eyes e, Part p)
                : image (i)
                , frame (f)
+               , eyes (e)
                , part (p)
        {}
 
        boost::shared_ptr<const ImageProxy> image;
-       VideoFrame frame;
+       Frame frame;
+       Eyes eyes;
        Part part;
 };