Some improvements in progress reporting, especially for long jobs.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index a4df202a21e6758da1cffb35dff53f0c73e3fcd0..ab3f40762e4f512ae94012778ae8422171ac6261 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -66,7 +66,7 @@ public:
         *  @param i Video frame image.
         *  @param same true if i is the same as the last time we were called.
         */
-       void process_video (boost::shared_ptr<const Image> i, Eyes eyes, bool same);
+       void process_video (boost::shared_ptr<const Image> i, Eyes eyes, ColourConversion, bool same);
 
        /** Call with some audio data */
        void process_audio (boost::shared_ptr<const AudioBuffers>);
@@ -81,7 +81,7 @@ private:
        
        void frame_done ();
        
-       void encoder_thread (boost::shared_ptr<ServerDescription>);
+       void encoder_thread (boost::optional<ServerDescription>);
        void terminate_threads ();
 
        /** Film that we are encoding */
@@ -89,7 +89,7 @@ private:
        boost::shared_ptr<Job> _job;
 
        /** Mutex for _time_history and _last_frame */
-       mutable boost::mutex _history_mutex;
+       mutable boost::mutex _state_mutex;
        /** List of the times of completion of the last _history_size frames;
            first is the most recently completed.
        */