diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-10-19 15:41:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-10-19 15:41:41 +0100 |
| commit | 11325f810e214935e4115248223c186a6e4cc184 (patch) | |
| tree | b529056e5f0001cccb0621f31a3bed5d4f43e2da /src/lib/encoder.h | |
| parent | 6543d9a51b31ce24726187d9d1b018f05f09ef40 (diff) | |
Some improvements in progress reporting, especially for long jobs.
Diffstat (limited to 'src/lib/encoder.h')
| -rw-r--r-- | src/lib/encoder.h | 13 |
1 files changed, 1 insertions, 12 deletions
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<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; |
