Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / lib / encoder.h

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index b255a617ff65d365a11bd031b884b44f385e4686..76c87a9f7ad2ea57468a58408ea3ca663821340b 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -33,7 +33,6 @@
 #include <boost/thread.hpp>
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
-#include <boost/atomic.hpp>
 #include <list>
 #include <stdint.h>
 
@@ -96,7 +95,9 @@ private:
        bool _left_done;
        bool _right_done;
 
-       boost::atomic<bool> _terminate;
+       /* XXX: probably should be atomic */
+       bool _terminate_enqueue;
+       bool _terminate_encoding;
        /** Mutex for _threads */
        mutable boost::mutex _threads_mutex;
        std::list<boost::thread *> _threads;