From 11c07c6fd98620c859c7d3dcf6a4bbf6a05e567e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 21 May 2019 01:47:22 +0100
Subject: Give an error if 2D content is set to 3D (#1565).  Also run 3D tests
 with more parallel jobs to speed them up.

---
 src/lib/video_decoder.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/lib/video_decoder.h')

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index c2ba8386e..76a91c525 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -62,9 +62,10 @@ 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;
+	/** Frame of last thing to be emitted */
+	boost::optional<Frame> _last_emitted_frame;
+	boost::optional<Eyes> _last_emitted_eyes;
 	dcpomatic::ContentTime _position;
 };
 
-- 
cgit v1.2.3