X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=1221750b0bc039c0b33e95b9026d6b1ac4427a2f;hb=744905d4ec6a05b53c17efb393a0ef907d95ebe2;hp=1dacc0996cfea447785848f30411d04c5028a28f;hpb=1f3740351a99b9c5cb4cb8a3537e27db9f2e6f60;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 1dacc09..1221750 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -36,7 +36,7 @@
 #include <libsigrok/libsigrok.h>
 
 struct srd_decoder;
-struct srd_probe;
+struct srd_channel;
 
 namespace pv {
 
@@ -87,6 +87,8 @@ public:
 	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;
@@ -114,10 +116,8 @@ private:
 
 	void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
 
-	void set_default_device();
-
 	boost::shared_ptr<view::Signal> signal_from_probe(
-		const sr_probe *probe) const;
+		const sr_channel *probe) const;
 
 	void read_sample_rate(const sr_dev_inst *const sdi);
 
@@ -176,7 +176,7 @@ private:
 	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::map< const sr_channel*, boost::shared_ptr<data::AnalogSnapshot> >
 		_cur_analog_snapshots;
 
 	boost::thread _sampling_thread;