From 11325f810e214935e4115248223c186a6e4cc184 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 19 Oct 2013 15:41:41 +0100 Subject: Some improvements in progress reporting, especially for long jobs. --- src/lib/encoder.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/lib/encoder.h') diff --git a/src/lib/encoder.h b/src/lib/encoder.h index e9b30df9e..ab3f40762 100644 --- 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 _film; boost::shared_ptr _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; -- cgit v1.2.3