projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update for 'probe' -> 'channel' rename in libsigrok.
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index c152481e9841814d93669c8c85e3cccf2176e94c..e51acde2b6a2d93733177dd1865641c3512abd9d 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-177,15
+177,15
@@
void SigSession::start_capture(function<void (const QString)> error_handler)
// Check that at least one probe is enabled
const GSList *l;
// Check that at least one probe is enabled
const GSList *l;
- for (l = _dev_inst->dev_inst()->
probe
s; l; l = l->next) {
- sr_
probe *const probe = (sr_probe
*)l->data;
+ for (l = _dev_inst->dev_inst()->
channel
s; l; l = l->next) {
+ sr_
channel *const probe = (sr_channel
*)l->data;
assert(probe);
if (probe->enabled)
break;
}
if (!l) {
assert(probe);
if (probe->enabled)
break;
}
if (!l) {
- error_handler(tr("No
probe
s enabled."));
+ error_handler(tr("No
channel
s enabled."));
return;
}
return;
}
@@
-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());
// Detect what data types we will receive
if(dev_inst) {
assert(dev_inst->dev_inst());
- for (const GSList *l = dev_inst->dev_inst()->
probe
s;
+ for (const GSList *l = dev_inst->dev_inst()->
channel
s;
l; l = l->next) {
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) {
if (!probe->enabled)
continue;
switch(probe->type) {
- case SR_
PROBE
_LOGIC:
+ case SR_
CHANNEL
_LOGIC:
logic_probe_count++;
break;
}
logic_probe_count++;
break;
}
@@
-361,20
+361,20
@@
void SigSession::update_signals(shared_ptr<device::DevInst> dev_inst)
break;
assert(dev_inst->dev_inst());
break;
assert(dev_inst->dev_inst());
- for (const GSList *l = dev_inst->dev_inst()->
probe
s;
+ for (const GSList *l = dev_inst->dev_inst()->
channel
s;
l; l = l->next) {
shared_ptr<view::Signal> signal;
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) {
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;
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());
{
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(
}
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) {
{
lock_guard<mutex> lock(_signals_mutex);
BOOST_FOREACH(shared_ptr<view::Signal> sig, _signals) {
@@
-538,20
+538,20
@@
void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
{
lock_guard<mutex> lock(_data_mutex);
{
lock_guard<mutex> lock(_data_mutex);
- const unsigned int probe_count = g_slist_length(analog.
probe
s);
+ const unsigned int probe_count = g_slist_length(analog.
channel
s);
const size_t sample_count = analog.num_samples / probe_count;
const float *data = analog.data;
bool sweep_beginning = false;
const size_t sample_count = analog.num_samples / probe_count;
const float *data = analog.data;
bool sweep_beginning = false;
- for (GSList *p = analog.
probe
s; p; p = p->next)
+ for (GSList *p = analog.
channel
s; p; p = p->next)
{
shared_ptr<data::AnalogSnapshot> snapshot;
{
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
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;
iterator iter = _cur_analog_snapshots.find(probe);
if (iter != _cur_analog_snapshots.end())
snapshot = (*iter).second;