X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=c7a81bfcd662de309ff9fa7dbbe65bec75fafafa;hp=1dacc0996cfea447785848f30411d04c5028a28f;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hpb=1f3740351a99b9c5cb4cb8a3537e27db9f2e6f60

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 1dacc099..c7a81bfc 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -22,10 +22,10 @@
 #define PULSEVIEW_PV_SIGSESSION_H
 
 #include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
@@ -36,7 +36,7 @@
 #include <libsigrok/libsigrok.h>
 
 struct srd_decoder;
-struct srd_probe;
+struct srd_channel;
 
 namespace pv {
 
@@ -76,17 +76,19 @@ 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)
 		throw(QString);
 
+	void set_default_device();
+
 	void release_device(device::DevInst *dev_inst);
 
 	capture_state get_capture_state() const;
@@ -95,15 +97,15 @@ public:
 
 	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);
@@ -112,12 +114,10 @@ public:
 private:
 	void set_capture_state(capture_state state);
 
-	void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
-
-	void set_default_device();
+	void update_signals(std::shared_ptr<device::DevInst> dev_inst);
 
-	boost::shared_ptr<view::Signal> signal_from_probe(
-		const sr_probe *probe) const;
+	std::shared_ptr<view::Signal> signal_from_probe(
+		const sr_channel *probe) const;
 
 	void read_sample_rate(const sr_dev_inst *const sdi);
 
@@ -137,7 +137,7 @@ private:
 		boost::function<void (const QString)> error_handler,
 		sr_input_format *format = NULL);
 
-	void sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
+	void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
 		boost::function<void (const QString)> error_handler);
 
 	void feed_in_header(const sr_dev_inst *sdi);
@@ -163,20 +163,20 @@ 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;
 	capture_state _capture_state;
 
 	mutable boost::mutex _signals_mutex;
-	std::vector< boost::shared_ptr<view::Signal> > _signals;
+	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_probe*, boost::shared_ptr<data::AnalogSnapshot> >
+	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;