projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libsigrok C++ bindings (patch version 7).
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index 7df31767ea5492659dcc8e1e33ef5b0a17c9cb4c..16ebc74d24a890f70f8ca3f5bf0d8b1335506f5b 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-29,15
+29,15
@@
#include <QLineEdit>
#include <QMenu>
#include <QLineEdit>
#include <QMenu>
-#include <libsigrok/libsigrok.h>
+#include <libsigrok/libsigrok.h
pp
>
#include "signal.h"
#include "view.h"
#include "signal.h"
#include "view.h"
-#include <pv/device/devinst.h>
-
using std::shared_ptr;
using std::shared_ptr;
+using sigrok::Channel;
+
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-58,10
+58,8
@@
const char *const ChannelNames[] = {
"SCL"
};
"SCL"
};
-Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
- const sr_channel *const channel) :
- Trace(channel->name),
- _dev_inst(dev_inst),
+Signal::Signal(shared_ptr<Channel> channel) :
+ Trace(channel->name().c_str()),
_channel(channel),
_name_widget(NULL),
_updating_name_widget(false)
_channel(channel),
_name_widget(NULL),
_updating_name_widget(false)
@@
-79,16
+77,16
@@
void Signal::set_name(QString name)
bool Signal::enabled() const
{
bool Signal::enabled() const
{
- return _channel->enabled;
+ return _channel->enabled
()
;
}
void Signal::enable(bool enable)
{
}
void Signal::enable(bool enable)
{
- _
dev_inst->enable_channel(_channel,
enable);
+ _
channel->set_enabled(
enable);
visibility_changed();
}
visibility_changed();
}
-
const sr_channel*
Signal::channel() const
+
shared_ptr<Channel>
Signal::channel() const
{
return _channel;
}
{
return _channel;
}