Give an error if 2D content is set to 3D (#1565). Also run

3D tests with more parallel jobs to speed them up.

1 files changed, 3 insertions, 2 deletions

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;
 };