Extract common code out into kdm_for_screen()

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

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index cc8a854eb1f852515bcf80adb4d7bbd7d6d467d9..b4542c40a147cca4ccbc62b39f340a5f6a660afe 100644 (file)
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -63,12 +63,12 @@ public:
        void begin ();
 
        /** Called to pass a bit of video to be encoded as the next DCP frame */
-       void encode (boost::shared_ptr<PlayerVideo> pv, DCPTime time);
+       void encode (boost::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
 
        /** Called when a processing run has finished */
        void end ();
 
-       float current_encoding_rate () const;
+       boost::optional<float> current_encoding_rate () const;
        int video_frames_enqueued () const;
 
        void servers_list_changed ();
@@ -89,7 +89,7 @@ private:
 
        /** Mutex for _threads */
        mutable boost::mutex _threads_mutex;
-       std::list<boost::thread *> _threads;
+       std::list<boost::thread*> _threads;
        mutable boost::mutex _queue_mutex;
        std::list<boost::shared_ptr<DCPVideo> > _queue;
        /** condition to manage thread wakeups when we have nothing to do */
@@ -100,8 +100,8 @@ private:
        boost::shared_ptr<Writer> _writer;
        Waker _waker;
 
-       boost::shared_ptr<PlayerVideo> _last_player_video;
-       boost::optional<DCPTime> _last_player_video_time;
+       boost::shared_ptr<PlayerVideo> _last_player_video[EYES_COUNT];
+       boost::optional<dcpomatic::DCPTime> _last_player_video_time;
 
        boost::signals2::scoped_connection _server_found_connection;
 };