projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation on 32-bit systems
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index f054eb2a6a2546f57eacef1025f1a0d54079bf77..48b400d1081d843bff33859ae0b5c6570adecd3c 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-32,7
+32,9
@@
#include "signal.h"
#include "view.h"
#include "signal.h"
#include "view.h"
-using boost::shared_ptr;
+#include <pv/device/devinst.h>
+
+using std::shared_ptr;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-54,8
+56,8
@@
const char *const ProbeNames[] = {
"SCL"
};
"SCL"
};
-Signal::Signal(shared_ptr<pv::DevInst> dev_inst,
-
sr_probe
*const probe) :
+Signal::Signal(shared_ptr<pv::
device::
DevInst> dev_inst,
+
const sr_channel
*const probe) :
Trace(probe->name),
_dev_inst(dev_inst),
_probe(probe),
Trace(probe->name),
_dev_inst(dev_inst),
_probe(probe),
@@
-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;
}