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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 292d5f9..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,8 +45,8 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(shared_ptr<pv::DevInst> dev_inst,
-	sr_probe *const probe, shared_ptr<data::Analog> data) :
+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)