Use libsigrok C++ bindings (patch version 7).

[pulseview.git] / pv / view / analogsignal.cpp

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index e3f51aabc6d787b00f10955432a1c53e73d5a179..7b49bbd2b7d454606d2ac5d51e482a331ca1b01c 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -28,11 +28,15 @@
 #include "pv/data/analogsnapshot.h"
 #include "pv/view/view.h"
 
+#include <libsigrok/libsigrok.hpp>
+
 using std::max;
 using std::min;
 using std::shared_ptr;
 using std::deque;
 
+using sigrok::Channel;
+
 namespace pv {
 namespace view {
 
@@ -45,13 +49,13 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(shared_ptr<pv::device::DevInst> dev_inst,
-       const sr_channel *const channel, shared_ptr<data::Analog> data) :
-       Signal(dev_inst, channel),
+AnalogSignal::AnalogSignal(shared_ptr<Channel> channel,
+       shared_ptr<data::Analog> data) :
+       Signal(channel),
        _data(data),
        _scale(1.0f)
 {
-       _colour = SignalColours[channel->index % countof(SignalColours)];
+       _colour = SignalColours[_channel->index() % countof(SignalColours)];
 }
 
 AnalogSignal::~AnalogSignal()
@@ -75,7 +79,7 @@ void AnalogSignal::set_scale(float scale)
 
 void AnalogSignal::paint_back(QPainter &p, int left, int right)
 {
-       if (_channel->enabled)
+       if (_channel->enabled())
                paint_axis(p, get_y(), left, right);
 }
 
@@ -92,7 +96,7 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 
        const double offset = _view->offset();
 
-       if (!_channel->enabled)
+       if (!_channel->enabled())
                return;
 
        const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =