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

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

diff --git a/pv/view/analogsignal.h b/pv/view/analogsignal.h
index 35db2ddc83f52055a11612fe3234c0f596543de7..4070a8aa199ecb29834559e912df27a9ad683fb6 100644 (file)
--- a/pv/view/analogsignal.h
+++ b/pv/view/analogsignal.h
@@ -23,7 +23,7 @@
 
 #include "signal.h"
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace pv {
 
@@ -42,11 +42,15 @@ private:
        static const float EnvelopeThreshold;
 
 public:
-       AnalogSignal(pv::SigSession &session, const sr_probe *const probe,
-               boost::shared_ptr<pv::data::Analog> data);
+       AnalogSignal(std::shared_ptr<sigrok::Channel> channel,
+               std::shared_ptr<pv::data::Analog> data);
 
        virtual ~AnalogSignal();
 
+       std::shared_ptr<pv::data::SignalData> data() const;
+
+       std::shared_ptr<pv::data::Analog> analog_data() const;
+
        void set_scale(float scale);
 
        /**
@@ -67,17 +71,17 @@ public:
 
 private:
        void paint_trace(QPainter &p,
-               const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+               const std::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
                int y, int left, const int64_t start, const int64_t end,
                const double pixels_offset, const double samples_per_pixel);
 
        void paint_envelope(QPainter &p,
-               const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+               const std::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
                int y, int left, const int64_t start, const int64_t end,
                const double pixels_offset, const double samples_per_pixel);
 
 private:
-       boost::shared_ptr<pv::data::Analog> _data;
+       std::shared_ptr<pv::data::Analog> _data;
        float _scale;
 };