diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-07 16:05:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-07 16:05:43 +0100 |
| commit | 538af3d961b5017303cedb56fa35c9be23d1658a (patch) | |
| tree | 5e1edb101585afa4e6bba75a9e2b7b49ffc00406 /src/lib/encoder.h | |
| parent | 2860640c7cf39410bfb21f69ce05e345e9078fa3 (diff) | |
Remove some flawed condition manipulation.
I think this stuff is unnecessary as wait() is interruptible
by boost::thread::interrupt. Hence instead of setting a flag
then signalling the condition we can just do interrupt(), the
exception will be thrown and that's that.
Diffstat (limited to 'src/lib/encoder.h')
| -rw-r--r-- | src/lib/encoder.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/encoder.h b/src/lib/encoder.h index 7e6fc4f30..6b830abba 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -55,7 +55,7 @@ class Encoder : public boost::noncopyable, public ExceptionStore { public: Encoder (boost::shared_ptr<const Film>, boost::shared_ptr<Writer>); - virtual ~Encoder (); + ~Encoder (); /** Called to indicate that a processing run is about to begin */ void begin (); @@ -94,9 +94,6 @@ private: /** Current DCP frame index */ Frame _position; - /* XXX: probably should be atomic */ - bool _terminate_enqueue; - bool _terminate_encoding; /** Mutex for _threads */ mutable boost::mutex _threads_mutex; std::list<boost::thread *> _threads; |
