#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 {
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)
{
{
}
-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;
}