X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=b441dab8aaf429608dc6d848b47be4156902e57d;hp=1a5ac8cad96405655af7cfd0ca0211d6695b3e2d;hb=8bd26d8b9c831b509ee3241ea4dac6f50c023622;hpb=82f50b10f8fd45a772f9ba40c4ef1f888ed6b8b1

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 1a5ac8ca..b441dab8 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -126,6 +126,28 @@ void SigSession::set_file(const string &name) throw(QString)
 	set_device(shared_ptr<device::DevInst>(device::File::create(name)));
 }
 
+void SigSession::set_default_device()
+{
+	shared_ptr<pv::device::DevInst> default_device;
+	const list< shared_ptr<device::Device> > &devices =
+		_device_manager.devices();
+
+	if (!devices.empty()) {
+		// Fall back to the first device in the list.
+		default_device = devices.front();
+
+		// Try and find the demo device and select that by default
+		BOOST_FOREACH (shared_ptr<pv::device::Device> dev, devices)
+			if (strcmp(dev->dev_inst()->driver->name,
+				"demo") == 0) {
+				default_device = dev;
+				break;
+			}
+	}
+
+	set_device(default_device);
+}
+
 void SigSession::release_device(device::DevInst *dev_inst)
 {
 	(void)dev_inst;
@@ -155,15 +177,15 @@ 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;
 	}
 
@@ -206,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
@@ -218,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);
@@ -290,28 +312,6 @@ void SigSession::set_capture_state(capture_state state)
 		capture_state_changed(state);
 }
 
-void SigSession::set_default_device()
-{
-	shared_ptr<pv::device::DevInst> default_device;
-	const list< shared_ptr<device::Device> > &devices =
-		_device_manager.devices();
-
-	if (!devices.empty()) {
-		// Fall back to the first device in the list.
-		default_device = devices.front();
-
-		// Try and find the demo device and select that by default
-		BOOST_FOREACH (shared_ptr<pv::device::Device> dev, devices)
-			if (strcmp(dev->dev_inst()->driver->name,
-				"demo") == 0) {
-				default_device = dev;
-				break;
-			}
-	}
-
-	set_device(default_device);
-}
-
 void SigSession::update_signals(shared_ptr<device::DevInst> dev_inst)
 {
 	assert(dev_inst);
@@ -325,14 +325,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 +361,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,7 +399,7 @@ 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) {
@@ -531,27 +531,27 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 		_cur_logic_snapshot->append_payload(logic);
 	}
 
-	data_updated();
+	data_received();
 }
 
 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;
@@ -592,7 +592,7 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
 		set_capture_state(Running);
 	}
 
-	data_updated();
+	data_received();
 }
 
 void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
@@ -633,7 +633,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 			_cur_logic_snapshot.reset();
 			_cur_analog_snapshots.clear();
 		}
-		data_updated();
+		frame_ended();
 		break;
 	}
 	}