Restore checking of 2D files that are incorrectly set as 3D.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 0fc7ca5a404832a34ba5daadcd567611a5eaa277..62757e3a9356b2e71681aea6ded0afa1aad2b60b 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -51,7 +51,7 @@ public:
        friend struct ffmpeg_pts_offset_test;
        friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length);
 
-       ContentTime position (boost::shared_ptr<const Film>) const {
+       boost::optional<dcpomatic::ContentTime> position (boost::shared_ptr<const Film>) const {
                return _position;
        }
 
@@ -62,10 +62,12 @@ public:
        boost::signals2::signal<void (ContentVideo)> Data;
 
 private:
-       /** Time of last thing to be emitted */
        boost::shared_ptr<const Content> _content;
-       boost::optional<Frame> _last_emitted;
-       ContentTime _position;
+       /** Frame of last thing to be emitted; only used for 3D */
+       boost::optional<Frame> _last_emitted_frame;
+       boost::optional<Eyes> _last_emitted_eyes;
+       boost::optional<dcpomatic::ContentTime> _position;
+       std::vector<Frame> _last_threed_frames;
 };
 
 #endif