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
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index ba1271b0c4251afee4f3dedfff8b534d59a3d647..3312c5924576b9517c5aa6425de4f935cbf95e63 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-32,6
+32,8
@@
#include "signal.h"
#include "view.h"
#include "signal.h"
#include "view.h"
+#include <pv/device/devinst.h>
+
using boost::shared_ptr;
namespace pv {
using boost::shared_ptr;
namespace pv {
@@
-54,9
+56,9
@@
const char *const ProbeNames[] = {
"SCL"
};
"SCL"
};
-Signal::Signal(
pv::SigSession &session, shared_ptr<pv
::DevInst> dev_inst,
-
sr_probe
*const probe) :
- Trace(
session,
probe->name),
+Signal::Signal(
shared_ptr<pv::device
::DevInst> dev_inst,
+
const sr_channel
*const probe) :
+ Trace(probe->name),
_dev_inst(dev_inst),
_probe(probe),
_name_widget(NULL),
_dev_inst(dev_inst),
_probe(probe),
_name_widget(NULL),
@@
-80,11
+82,11
@@
bool Signal::enabled() const
void Signal::enable(bool enable)
{
void Signal::enable(bool enable)
{
- _
probe->enabled = enable
;
+ _
dev_inst->enable_probe(_probe, enable)
;
visibility_changed();
}
visibility_changed();
}
-const sr_
probe
* Signal::probe() const
+const sr_
channel
* Signal::probe() const
{
return _probe;
}
{
return _probe;
}