Fix failure on 1-frame-back seek (#604).

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 1da5d1c96b6a67d0bc7714fcbdfd29dd9bc89bc3..8b7c1f3adfea058c8194f4ca08a0ee7105b387b0 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 #define DCPOMATIC_ENCODER_H
 
 /** @file src/encoder.h
- *  @brief Encoder to J2K and WAV for DCP.
+ *  @brief Encoder class.
  */
 
 #include "util.h"
@@ -45,10 +45,8 @@ class AudioBuffers;
 class Film;
 class ServerDescription;
 class DCPVideo;
-class EncodedData;
 class Writer;
 class Job;
-class ServerFinder;
 class PlayerVideo;
 
 /** @class Encoder
@@ -100,8 +98,8 @@ private:
        /** Number of frames that we should keep history for */
        static int const _history_size;
 
-       /** Number of video frames written for the DCP so far */
-       int _video_frames_out;
+       /** Number of video frames enqueued so far */
+       int _video_frames_enqueued;
 
        bool _terminate;
        std::list<boost::shared_ptr<DCPVideo> > _queue;
@@ -114,6 +112,10 @@ private:
 
        boost::shared_ptr<Writer> _writer;
        Waker _waker;
+
+       boost::shared_ptr<PlayerVideo> _last_player_video;
+
+       boost::signals2::scoped_connection _server_found_connection;
 };
 
 #endif