X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.h;h=a7ae455b8598159e47c738a48cc5e8176ace3ed7;hp=0b6172f8144884d51b5ba2a918db6bf8106f7d86;hb=a77dac4e7ab85ac97f7ff63862d28948ae4dec61;hpb=03ce95a9bb81c05bae0da9de189d280214db67c3

diff --git a/pv/view/analogsignal.h b/pv/view/analogsignal.h
index 0b6172f8..a7ae455b 100644
--- a/pv/view/analogsignal.h
+++ b/pv/view/analogsignal.h
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_ANALOGSIGNAL_H
-#define PULSEVIEW_PV_ANALOGSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
 
 #include "signal.h"
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 namespace pv {
 
@@ -42,11 +42,16 @@ private:
 	static const float EnvelopeThreshold;
 
 public:
-	AnalogSignal(pv::SigSession &session, const sr_probe *const probe,
-		boost::shared_ptr<pv::data::Analog> data);
+	AnalogSignal(pv::SigSession &session,
+		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,21 +72,21 @@ 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;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_ANALOGSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H