projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to new session API.
[pulseview.git]
/
pv
/
device
/
devinst.cpp
diff --git
a/pv/device/devinst.cpp
b/pv/device/devinst.cpp
index 86595ae79069a9c7e2b9e33700e1c5eee7be8661..cb37ceefd51d39b5a5783c4960af9aabbc58f4d0 100644
(file)
--- a/
pv/device/devinst.cpp
+++ b/
pv/device/devinst.cpp
@@
-56,7
+56,7
@@
SigSession* DevInst::owner() const
return _owner;
}
return _owner;
}
-GVariant* DevInst::get_config(const sr_
probe
_group *group, int key)
+GVariant* DevInst::get_config(const sr_
channel
_group *group, int key)
{
GVariant *data = NULL;
assert(_owner);
{
GVariant *data = NULL;
assert(_owner);
@@
-67,7
+67,7
@@
GVariant* DevInst::get_config(const sr_probe_group *group, int key)
return data;
}
return data;
}
-bool DevInst::set_config(const sr_
probe
_group *group, int key, GVariant *data)
+bool DevInst::set_config(const sr_
channel
_group *group, int key, GVariant *data)
{
assert(_owner);
sr_dev_inst *const sdi = dev_inst();
{
assert(_owner);
sr_dev_inst *const sdi = dev_inst();
@@
-79,7
+79,7
@@
bool DevInst::set_config(const sr_probe_group *group, int key, GVariant *data)
return false;
}
return false;
}
-GVariant* DevInst::list_config(const sr_
probe
_group *group, int key)
+GVariant* DevInst::list_config(const sr_
channel
_group *group, int key)
{
GVariant *data = NULL;
assert(_owner);
{
GVariant *data = NULL;
assert(_owner);
@@
-90,14
+90,14
@@
GVariant* DevInst::list_config(const sr_probe_group *group, int key)
return data;
}
return data;
}
-void DevInst::enable_probe(const sr_
probe
*probe, bool enable)
+void DevInst::enable_probe(const sr_
channel
*probe, bool enable)
{
assert(_owner);
sr_dev_inst *const sdi = dev_inst();
assert(sdi);
{
assert(_owner);
sr_dev_inst *const sdi = dev_inst();
assert(sdi);
- for (const GSList *p = sdi->
probe
s; p; p = p->next)
+ for (const GSList *p = sdi->
channel
s; p; p = p->next)
if (probe == p->data) {
if (probe == p->data) {
- const_cast<sr_
probe
*>(probe)->enabled = enable;
+ const_cast<sr_
channel
*>(probe)->enabled = enable;
config_changed();
return;
}
config_changed();
return;
}
@@
-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