From cbb8260e395058da76b3de518ebc535a114c54b1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 26 Feb 2021 01:24:26 +0100 Subject: Fix a set of mistakes related to 3D content. --- src/lib/video_decoder.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/lib/video_decoder.h') diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index 5d9a6b8a0..9d69f743a 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,13 +18,16 @@ */ + /** @file src/lib/video_decoder.h * @brief VideoDecoder class. */ + #ifndef DCPOMATIC_VIDEO_DECODER_H #define DCPOMATIC_VIDEO_DECODER_H + #include "decoder.h" #include "video_content.h" #include "util.h" @@ -32,12 +35,14 @@ #include "decoder_part.h" #include + class VideoContent; class ImageProxy; class Image; class Log; class FrameIntervalChecker; + /** @class VideoDecoder * @brief Parent for classes which decode video. */ @@ -62,11 +67,11 @@ public: private: std::shared_ptr _content; - /** Frame of last thing to be emitted; only used for 3D */ - boost::optional _last_emitted_frame; + /** Eyes of last thing to be emitted; only used for THREE_D_ALTERNATE */ boost::optional _last_emitted_eyes; boost::optional _position; boost::scoped_ptr _frame_interval_checker; }; + #endif -- cgit v1.2.3