diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-05-09 16:38:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-05-09 16:38:36 +0100 |
| commit | 6a11232620e0006f6a2b1e8d2b56e56d84229d5c (patch) | |
| tree | 5ea8d25d95aac54dbf7e45fa72c50215ff5fc437 /src/lib/encoder.h | |
| parent | 837a54744277a5252a1a69b0690305e9a669124d (diff) | |
Basic GUI for export.
Diffstat (limited to 'src/lib/encoder.h')
| -rw-r--r-- | src/lib/encoder.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/encoder.h b/src/lib/encoder.h index fe18f8b2d..7e9bd497a 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -27,6 +27,7 @@ #include "util.h" #include "cross.h" +#include "event_history.h" #include "exception_store.h" #include <boost/shared_ptr.hpp> #include <boost/thread/mutex.hpp> @@ -84,14 +85,7 @@ private: /** Film that we are encoding */ boost::shared_ptr<const Film> _film; - /** Mutex for _time_history */ - mutable boost::mutex _state_mutex; - /** List of the times of completion of the last _history_size frames; - first is the most recently completed. - */ - std::list<struct timeval> _time_history; - /** Number of frames that we should keep history for */ - static int const _history_size; + EventHistory _history; /** Mutex for _threads */ mutable boost::mutex _threads_mutex; |
