Basic release notes support (#2282).

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 5d9a6b8a051a62059f9717771c4585d4eb5aae86..828ac66a20af1cbbff7785f039b9c1fd8a32bddb 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     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 <boost/signals2.hpp>
 
+
 class VideoContent;
 class ImageProxy;
 class Image;
 class Log;
 class FrameIntervalChecker;
 
+
 /** @class VideoDecoder
  *  @brief Parent for classes which decode video.
  */
@@ -51,22 +56,22 @@ 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);
 
-       boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const {
+       boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const override {
                return _position;
        }
 
-       void seek ();
+       void seek () override;
        void emit (std::shared_ptr<const Film> film, std::shared_ptr<const ImageProxy>, Frame frame);
 
        boost::signals2::signal<void (ContentVideo)> Data;
 
 private:
        std::shared_ptr<const Content> _content;
-       /** Frame of last thing to be emitted; only used for 3D */
-       boost::optional<Frame> _last_emitted_frame;
+       /** Eyes of last thing to be emitted; only used for THREE_D_ALTERNATE */
        boost::optional<Eyes> _last_emitted_eyes;
        boost::optional<dcpomatic::ContentTime> _position;
        boost::scoped_ptr<FrameIntervalChecker> _frame_interval_checker;
 };
 
+
 #endif