X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=82e31a842c0134bfed1c94dafdb1c2c3b06129f9;hb=3b68d03ddae96edb38a80f31bf6a990bde21cd1d;hp=eb828a1bfff61c93b58386618e03cb534f6ff850;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index eb828a1..82e31a8 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -20,16 +20,17 @@
 
 #include <extdef.h>
 
-#include <math.h>
+#include <cassert>
+#include <cmath>
 
 #include "analogsignal.h"
 #include "pv/data/analog.h"
 #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 +45,9 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(pv::SigSession &session, sr_probe *const probe,
-	shared_ptr<data::Analog> data) :
-	Signal(session, probe),
+AnalogSignal::AnalogSignal(shared_ptr<pv::device::DevInst> dev_inst,
+	const sr_channel *const probe, shared_ptr<data::Analog> data) :
+	Signal(dev_inst, probe),
 	_data(data),
 	_scale(1.0f)
 {
@@ -57,7 +58,12 @@ AnalogSignal::~AnalogSignal()
 {
 }
 
-boost::shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+	return _data;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
 {
 	return _data;
 }