X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=927b2e7c3a5e41800b0669aff04997d267e18b7d;hb=512bfc565937c0c1b07ec0e6486831526a6e1eee;hp=1221750b0bc039c0b33e95b9026d6b1ac4427a2f;hpb=8bd26d8b9c831b509ee3241ea4dac6f50c023622;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 1221750b..927b2e7c 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -21,13 +21,12 @@
 #ifndef PULSEVIEW_PV_SIGSESSION_H
 #define PULSEVIEW_PV_SIGSESSION_H
 
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-
 #include <map>
+#include <memory>
+#include <mutex>
 #include <set>
 #include <string>
+#include <thread>
 #include <vector>
 
 #include <QObject>
@@ -76,12 +75,12 @@ public:
 
 	~SigSession();
 
-	boost::shared_ptr<device::DevInst> get_device() const;
+	std::shared_ptr<device::DevInst> get_device() const;
 
 	/**
 	 * Sets device instance that will be used in the next capture session.
 	 */
-	void set_device(boost::shared_ptr<device::DevInst> dev_inst)
+	void set_device(std::shared_ptr<device::DevInst> dev_inst)
 		throw(QString);
 
 	void set_file(const std::string &name)
@@ -93,19 +92,19 @@ public:
 
 	capture_state get_capture_state() const;
 
-	void start_capture(boost::function<void (const QString)> error_handler);
+	void start_capture(std::function<void (const QString)> error_handler);
 
 	void stop_capture();
 
-	std::set< boost::shared_ptr<data::SignalData> > get_data() const;
+	std::set< std::shared_ptr<data::SignalData> > get_data() const;
 
-	std::vector< boost::shared_ptr<view::Signal> >
+	std::vector< std::shared_ptr<view::Signal> >
 		get_signals() const;
 
 #ifdef ENABLE_DECODE
 	bool add_decoder(srd_decoder *const dec);
 
-	std::vector< boost::shared_ptr<view::DecodeTrace> >
+	std::vector< std::shared_ptr<view::DecodeTrace> >
 		get_decode_signals() const;
 
 	void remove_decode_signal(view::DecodeTrace *signal);
@@ -114,9 +113,9 @@ public:
 private:
 	void set_capture_state(capture_state state);
 
-	void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
+	void update_signals(std::shared_ptr<device::DevInst> dev_inst);
 
-	boost::shared_ptr<view::Signal> signal_from_probe(
+	std::shared_ptr<view::Signal> signal_from_probe(
 		const sr_channel *probe) const;
 
 	void read_sample_rate(const sr_dev_inst *const sdi);
@@ -134,11 +133,11 @@ private:
 
 	static sr_input* load_input_file_format(
 		const std::string &filename,
-		boost::function<void (const QString)> error_handler,
+		std::function<void (const QString)> error_handler,
 		sr_input_format *format = NULL);
 
-	void sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
-		boost::function<void (const QString)> error_handler);
+	void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
+		std::function<void (const QString)> error_handler);
 
 	void feed_in_header(const sr_dev_inst *sdi);
 
@@ -163,23 +162,23 @@ private:
 	/**
 	 * The device instance that will be used in the next capture session.
 	 */
-	boost::shared_ptr<device::DevInst> _dev_inst;
+	std::shared_ptr<device::DevInst> _dev_inst;
 
-	std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
+	std::vector< std::shared_ptr<view::DecodeTrace> > _decode_traces;
 
-	mutable boost::mutex _sampling_mutex;
+	mutable std::mutex _sampling_mutex;
 	capture_state _capture_state;
 
-	mutable boost::mutex _signals_mutex;
-	std::vector< boost::shared_ptr<view::Signal> > _signals;
+	mutable std::mutex _signals_mutex;
+	std::vector< std::shared_ptr<view::Signal> > _signals;
 
-	mutable boost::mutex _data_mutex;
-	boost::shared_ptr<data::Logic> _logic_data;
-	boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
-	std::map< const sr_channel*, boost::shared_ptr<data::AnalogSnapshot> >
+	mutable std::mutex _data_mutex;
+	std::shared_ptr<data::Logic> _logic_data;
+	std::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
+	std::map< const sr_channel*, std::shared_ptr<data::AnalogSnapshot> >
 		_cur_analog_snapshots;
 
-	boost::thread _sampling_thread;
+	std::thread _sampling_thread;
 
 signals:
 	void capture_state_changed(int state);