X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=0072224044fc5816ef96dbd94d9d48eaa1b73397;hb=f2e3522a9dcf7bd0a7a1f1073e45b4450e3b68f0;hp=5d9a6b8a051a62059f9717771c4585d4eb5aae86;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 5d9a6b8a0..007222404 100644
--- 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 emit (std::shared_ptr<const Film> film, std::shared_ptr<const ImageProxy>, Frame frame);
+	void seek () override;
+	void emit(std::shared_ptr<const Film> film, std::shared_ptr<const ImageProxy>, dcpomatic::ContentTime time);
 
 	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