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 e9b30df9e558cbf60c00f54e612869d7e2887b09..ab3f40762e4f512ae94012778ae8422171ac6261 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -77,16 +77,6 @@ public:
        float current_encoding_rate () const;
        int video_frames_out () const;
 
-       enum State {
-               TRANSCODING,
-               HASHING
-       };
-
-       State state () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _state;
-       }
-
 private:
        
        void frame_done ();
@@ -98,7 +88,7 @@ private:
        boost::shared_ptr<const Film> _film;
        boost::shared_ptr<Job> _job;
 
-       /** Mutex for _time_history, _last_frame and _state */
+       /** Mutex for _time_history and _last_frame */
        mutable boost::mutex _state_mutex;
        /** List of the times of completion of the last _history_size frames;
            first is the most recently completed.
@@ -109,7 +99,6 @@ private:
 
        /** Number of video frames written for the DCP so far */
        int _video_frames_out;
-       State _state;
 
        bool _have_a_real_frame[EYES_COUNT];
        bool _terminate;