projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix double-free issue in File::create
[pulseview.git]
/
pv
/
device
/
devinst.cpp
diff --git
a/pv/device/devinst.cpp
b/pv/device/devinst.cpp
index 4543e5c81d8dba5cf212918bdb31cfa199e6476d..0301063440200d4b693105623f329fbce303b9f6 100644
(file)
--- a/
pv/device/devinst.cpp
+++ b/
pv/device/devinst.cpp
@@
-90,19
+90,19
@@
GVariant* DevInst::list_config(const sr_channel_group *group, int key)
return data;
}
return data;
}
-void DevInst::enable_
probe(const sr_channel *probe
, bool enable)
+void DevInst::enable_
channel(const sr_channel *channel
, bool enable)
{
assert(_owner);
sr_dev_inst *const sdi = dev_inst();
assert(sdi);
for (const GSList *p = sdi->channels; p; p = p->next)
{
assert(_owner);
sr_dev_inst *const sdi = dev_inst();
assert(sdi);
for (const GSList *p = sdi->channels; p; p = p->next)
- if (
probe
== p->data) {
- const_cast<sr_channel*>(
probe
)->enabled = enable;
+ if (
channel
== p->data) {
+ const_cast<sr_channel*>(
channel
)->enabled = enable;
config_changed();
return;
}
config_changed();
return;
}
- //
Probe
was not found in the device
+ //
Channel
was not found in the device
assert(0);
}
assert(0);
}
@@
-126,13
+126,13
@@
bool DevInst::is_trigger_enabled() const
void DevInst::start()
{
void DevInst::start()
{
- if (sr_session_start() != SR_OK)
+ if (sr_session_start(
SigSession::_sr_session
) != SR_OK)
throw tr("Failed to start session.");
}
void DevInst::run()
{
throw tr("Failed to start session.");
}
void DevInst::run()
{
- sr_session_run();
+ sr_session_run(
SigSession::_sr_session
);
}
} // device
}
} // device