Make terminate_threads() less likely to leave _threads containing invalid pointers.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 959ff7ac70c54ad7be8cf1f856812ee88d8a6bdf..ed56feea05284ccc785e74ba1167b2049cf6322f 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -44,27 +44,28 @@ class Log;
 class VideoDecoder : public DecoderPart
 {
 public:
-       VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c, boost::shared_ptr<Log> log);
+       VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c);
 
        friend struct video_decoder_fill_test1;
        friend struct video_decoder_fill_test2;
        friend struct ffmpeg_pts_offset_test;
        friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length);
 
-       ContentTime position () const {
+       ContentTime position (boost::shared_ptr<const Film>) const {
                return _position;
        }
 
        void seek ();
-
-       void emit (boost::shared_ptr<const ImageProxy>, Frame frame);
+       void emit (boost::shared_ptr<const Film> film, boost::shared_ptr<const ImageProxy>, Frame frame);
 
        /** @return true if the emitted data was accepted, false if not */
        boost::signals2::signal<void (ContentVideo)> Data;
 
 private:
        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;
        ContentTime _position;
 };