X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=cbcbaa8897e3add1bf5506e2c31a8438da14108a;hp=c152481e9841814d93669c8c85e3cccf2176e94c;hb=d23445348bf04a698e062a3b917360313ecbcaad;hpb=6fd0b63971f179a28c2c558055da760c2c44231a

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index c152481e..cbcbaa88 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -39,24 +39,22 @@
 #include "view/decodetrace.h"
 #include "view/logicsignal.h"
 
-#include <assert.h>
-
+#include <cassert>
+#include <mutex>
 #include <stdexcept>
 
-#include <boost/foreach.hpp>
-
 #include <sys/stat.h>
 
 #include <QDebug>
 
-using boost::dynamic_pointer_cast;
-using boost::function;
-using boost::lock_guard;
-using boost::mutex;
-using boost::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::function;
+using std::lock_guard;
+using std::mutex;
 using std::list;
 using std::map;
 using std::set;
+using std::shared_ptr;
 using std::string;
 using std::vector;
 
@@ -120,8 +118,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)));
 }
@@ -137,7 +135,7 @@ void SigSession::set_default_device()
 		default_device = devices.front();
 
 		// Try and find the demo device and select that by default
-		BOOST_FOREACH (shared_ptr<pv::device::Device> dev, devices)
+		for (shared_ptr<pv::device::Device> dev : devices)
 			if (strcmp(dev->dev_inst()->driver->name,
 				"demo") == 0) {
 				default_device = dev;
@@ -177,20 +175,20 @@ void SigSession::start_capture(function<void (const QString)> error_handler)
 
 	// Check that at least one probe is enabled
 	const GSList *l;
-	for (l = _dev_inst->dev_inst()->probes; l; l = l->next) {
-		sr_probe *const probe = (sr_probe*)l->data;
+	for (l = _dev_inst->dev_inst()->channels; l; l = l->next) {
+		sr_channel *const probe = (sr_channel*)l->data;
 		assert(probe);
 		if (probe->enabled)
 			break;
 	}
 
 	if (!l) {
-		error_handler(tr("No probes enabled."));
+		error_handler(tr("No channels enabled."));
 		return;
 	}
 
 	// Begin the session
-	_sampling_thread = boost::thread(
+	_sampling_thread = std::thread(
 		&SigSession::sample_thread_proc, this, _dev_inst,
 			error_handler);
 }
@@ -211,7 +209,7 @@ set< shared_ptr<data::SignalData> > SigSession::get_data() const
 {
 	lock_guard<mutex> lock(_signals_mutex);
 	set< shared_ptr<data::SignalData> > data;
-	BOOST_FOREACH(const shared_ptr<view::Signal> sig, _signals) {
+	for (const shared_ptr<view::Signal> sig : _signals) {
 		assert(sig);
 		data.insert(sig->data());
 	}
@@ -228,7 +226,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 +238,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(shared_ptr<view::Signal> s, _signals)
+		for (const srd_channel *pdch : all_probes)
+			for (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);
@@ -290,10 +288,7 @@ vector< shared_ptr<view::DecodeTrace> > SigSession::get_decode_signals() const
 
 void SigSession::remove_decode_signal(view::DecodeTrace *signal)
 {
-	for (vector< shared_ptr<view::DecodeTrace> >::iterator i =
-		_decode_traces.begin();
-		i != _decode_traces.end();
-		i++)
+	for (auto i = _decode_traces.begin(); i != _decode_traces.end(); i++)
 		if ((*i).get() == signal)
 		{
 			_decode_traces.erase(i);
@@ -325,14 +320,14 @@ void SigSession::update_signals(shared_ptr<device::DevInst> dev_inst)
 	// Detect what data types we will receive
 	if(dev_inst) {
 		assert(dev_inst->dev_inst());
-		for (const GSList *l = dev_inst->dev_inst()->probes;
+		for (const GSList *l = dev_inst->dev_inst()->channels;
 			l; l = l->next) {
-			const sr_probe *const probe = (const sr_probe *)l->data;
+			const sr_channel *const probe = (const sr_channel *)l->data;
 			if (!probe->enabled)
 				continue;
 
 			switch(probe->type) {
-			case SR_PROBE_LOGIC:
+			case SR_CHANNEL_LOGIC:
 				logic_probe_count++;
 				break;
 			}
@@ -361,20 +356,20 @@ void SigSession::update_signals(shared_ptr<device::DevInst> dev_inst)
 			break;
 
 		assert(dev_inst->dev_inst());
-		for (const GSList *l = dev_inst->dev_inst()->probes;
+		for (const GSList *l = dev_inst->dev_inst()->channels;
 			l; l = l->next) {
 			shared_ptr<view::Signal> signal;
-			sr_probe *const probe =	(sr_probe *)l->data;
+			sr_channel *const probe = (sr_channel *)l->data;
 			assert(probe);
 
 			switch(probe->type) {
-			case SR_PROBE_LOGIC:
+			case SR_CHANNEL_LOGIC:
 				signal = shared_ptr<view::Signal>(
 					new view::LogicSignal(dev_inst,
 						probe, _logic_data));
 				break;
 
-			case SR_PROBE_ANALOG:
+			case SR_CHANNEL_ANALOG:
 			{
 				shared_ptr<data::Analog> data(
 					new data::Analog());
@@ -399,10 +394,10 @@ void SigSession::update_signals(shared_ptr<device::DevInst> dev_inst)
 }
 
 shared_ptr<view::Signal> SigSession::signal_from_probe(
-	const sr_probe *probe) const
+	const sr_channel *probe) const
 {
 	lock_guard<mutex> lock(_signals_mutex);
-	BOOST_FOREACH(shared_ptr<view::Signal> sig, _signals) {
+	for (shared_ptr<view::Signal> sig : _signals) {
 		assert(sig);
 		if (sig->probe() == probe)
 			return sig;
@@ -431,7 +426,7 @@ void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
 
 	// Set the sample rate of all data
 	const set< shared_ptr<data::SignalData> > data_set = get_data();
-	BOOST_FOREACH(shared_ptr<data::SignalData> data, data_set) {
+	for (shared_ptr<data::SignalData> data : data_set) {
 		assert(data);
 		data->set_samplerate(sample_rate);
 	}
@@ -538,20 +533,20 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
 {
 	lock_guard<mutex> lock(_data_mutex);
 
-	const unsigned int probe_count = g_slist_length(analog.probes);
+	const unsigned int probe_count = g_slist_length(analog.channels);
 	const size_t sample_count = analog.num_samples / probe_count;
 	const float *data = analog.data;
 	bool sweep_beginning = false;
 
-	for (GSList *p = analog.probes; p; p = p->next)
+	for (GSList *p = analog.channels; p; p = p->next)
 	{
 		shared_ptr<data::AnalogSnapshot> snapshot;
 
-		sr_probe *const probe = (sr_probe*)p->data;
+		sr_channel *const probe = (sr_channel*)p->data;
 		assert(probe);
 
 		// Try to get the snapshot of the probe
-		const map< const sr_probe*, shared_ptr<data::AnalogSnapshot> >::
+		const map< const sr_channel*, shared_ptr<data::AnalogSnapshot> >::
 			iterator iter = _cur_analog_snapshots.find(probe);
 		if (iter != _cur_analog_snapshots.end())
 			snapshot = (*iter).second;