X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=156af1003a4440ed527516123f22352aa9768029;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hp=eb828a1bfff61c93b58386618e03cb534f6ff850;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index eb828a1..156af10 100644 --- a/pv/view/analogsignal.cpp +++ b/pv/view/analogsignal.cpp @@ -27,9 +27,9 @@ #include "pv/data/analogsnapshot.h" #include "pv/view/view.h" -using boost::shared_ptr; using std::max; using std::min; +using std::shared_ptr; using std::deque; namespace pv { @@ -44,9 +44,9 @@ const QColor AnalogSignal::SignalColours[4] = { const float AnalogSignal::EnvelopeThreshold = 256.0f; -AnalogSignal::AnalogSignal(pv::SigSession &session, sr_probe *const probe, - shared_ptr data) : - Signal(session, probe), +AnalogSignal::AnalogSignal(shared_ptr dev_inst, + const sr_channel *const probe, shared_ptr data) : + Signal(dev_inst, probe), _data(data), _scale(1.0f) { @@ -57,7 +57,12 @@ AnalogSignal::~AnalogSignal() { } -boost::shared_ptr AnalogSignal::data() const +shared_ptr AnalogSignal::data() const +{ + return _data; +} + +shared_ptr AnalogSignal::analog_data() const { return _data; }