X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.h;h=ab700ae0404bfd85129f761ed3886f413c03100b;hp=2eeaf1c76fa4c1cba4718c8e627c05e1bb0e7afa;hb=3b68d03ddae96edb38a80f31bf6a990bde21cd1d;hpb=8bd26d8b9c831b509ee3241ea4dac6f50c023622

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index 2eeaf1c7..ab700ae0 100644
--- a/pv/data/decoderstack.h
+++ b/pv/data/decoderstack.h
@@ -23,11 +23,14 @@
 
 #include "signaldata.h"
 
+#include <atomic>
+#include <condition_variable>
 #include <list>
+#include <map>
+#include <memory>
+#include <thread>
 
 #include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
 
 #include <QObject>
 #include <QString>
@@ -80,8 +83,8 @@ public:
 
 	virtual ~DecoderStack();
 
-	const std::list< boost::shared_ptr<decode::Decoder> >& stack() const;
-	void push(boost::shared_ptr<decode::Decoder> decoder);
+	const std::list< std::shared_ptr<decode::Decoder> >& stack() const;
+	void push(std::shared_ptr<decode::Decoder> decoder);
 	void remove(int index);
 
 	int64_t samples_decoded() const;
@@ -134,18 +137,18 @@ private:
 	 * @todo A proper solution should be implemented to allow multiple
 	 * decode operations.
 	 */
-	static boost::mutex _global_decode_mutex;
+	static std::mutex _global_decode_mutex;
 
-	std::list< boost::shared_ptr<decode::Decoder> > _stack;
+	std::list< std::shared_ptr<decode::Decoder> > _stack;
 
-	boost::shared_ptr<pv::data::LogicSnapshot> _snapshot;
+	std::shared_ptr<pv::data::LogicSnapshot> _snapshot;
 
-	mutable boost::mutex _input_mutex;
-	mutable boost::condition_variable _input_cond;
+	mutable std::mutex _input_mutex;
+	mutable std::condition_variable _input_cond;
 	int64_t _sample_count;
 	bool _frame_complete;
 
-	mutable boost::mutex _output_mutex;
+	mutable std::mutex _output_mutex;
 	int64_t	_samples_decoded;
 
 	std::map<const decode::Row, decode::RowData> _rows;
@@ -154,7 +157,8 @@ private:
 
 	QString _error_message;
 
-	boost::thread _decode_thread;
+	std::thread _decode_thread;
+	std::atomic<bool> _interrupt;
 
 	friend class DecoderStackTest::TwoDecoderStack;
 };