X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=5ba2e5da06e1a366990824c7b8989526381f0631;hb=40065ab65c4f347ac5c3731fcea628ab26b49c1e;hp=e51acde2b6a2d93733177dd1865641c3512abd9d;hpb=4871ed92f2d9e6e514223383ba16e6ad78c81161;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index e51acde2..5ba2e5da 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -120,8 +120,8 @@ void SigSession::set_device(
 
 void SigSession::set_file(const string &name) throw(QString)
 {
-	// Deslect the old device, because file type detection in File::create
-	// destorys the old session inside libsigrok.
+	// Deselect the old device, because file type detection in File::create
+	// destroys the old session inside libsigrok.
 	set_device(shared_ptr<device::DevInst>());
 	set_device(shared_ptr<device::DevInst>(device::File::create(name)));
 }
@@ -228,7 +228,7 @@ vector< shared_ptr<view::Signal> > SigSession::get_signals() const
 #ifdef ENABLE_DECODE
 bool SigSession::add_decoder(srd_decoder *const dec)
 {
-	map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
+	map<const srd_channel*, shared_ptr<view::LogicSignal> > probes;
 	shared_ptr<data::DecoderStack> decoder_stack;
 
 	try
@@ -240,22 +240,22 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 			new data::DecoderStack(*this, dec));
 
 		// Make a list of all the probes
-		std::vector<const srd_probe*> all_probes;
-		for(const GSList *i = dec->probes; i; i = i->next)
-			all_probes.push_back((const srd_probe*)i->data);
-		for(const GSList *i = dec->opt_probes; i; i = i->next)
-			all_probes.push_back((const srd_probe*)i->data);
+		std::vector<const srd_channel*> all_probes;
+		for(const GSList *i = dec->channels; i; i = i->next)
+			all_probes.push_back((const srd_channel*)i->data);
+		for(const GSList *i = dec->opt_channels; i; i = i->next)
+			all_probes.push_back((const srd_channel*)i->data);
 
 		// Auto select the initial probes
-		BOOST_FOREACH(const srd_probe *probe, all_probes)
+		BOOST_FOREACH(const srd_channel *pdch, all_probes)
 			BOOST_FOREACH(shared_ptr<view::Signal> s, _signals)
 			{
 				shared_ptr<view::LogicSignal> l =
 					dynamic_pointer_cast<view::LogicSignal>(s);
-				if (l && QString::fromUtf8(probe->name).
+				if (l && QString::fromUtf8(pdch->name).
 					toLower().contains(
 					l->get_name().toLower()))
-					probes[probe] = l;
+					probes[pdch] = l;
 			}
 
 		assert(decoder_stack);