From 538af3d961b5017303cedb56fa35c9be23d1658a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 7 Jun 2016 16:05:43 +0100 Subject: 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. --- src/lib/encoder.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/lib/encoder.h') 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, boost::shared_ptr); - 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 _threads; -- cgit v1.2.3