X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fanalogsegment.hpp;h=5267e77e604ed27fa6f3d3ad09ea4779e9d1f3e3;hp=e6c312ade78d3b7157b43cc2f9584ba283381edb;hb=85a702806a15852f3684645dffdc38cb30274481;hpb=7db61e770abd2d1c7eb326a09e35cd4266664c1d

diff --git a/pv/data/analogsegment.hpp b/pv/data/analogsegment.hpp
index e6c312a..5267e77 100644
--- a/pv/data/analogsegment.hpp
+++ b/pv/data/analogsegment.hpp
@@ -27,6 +27,8 @@
 
 #include <QObject>
 
+using std::pair;
+
 namespace AnalogSegmentTest {
 struct Basic;
 }
@@ -77,21 +79,20 @@ private:
 	static const uint64_t EnvelopeDataUnit;
 
 public:
-	AnalogSegment(Analog& owner, uint64_t samplerate);
+	AnalogSegment(Analog& owner, uint32_t segment_id, uint64_t samplerate);
 
 	virtual ~AnalogSegment();
 
 	void append_interleaved_samples(const float *data,
 		size_t sample_count, size_t stride);
 
-	const float* get_samples(int64_t start_sample,
-		int64_t end_sample) const;
+	void get_samples(int64_t start_sample, int64_t end_sample, float* dest) const;
 
-	const std::pair<float, float> get_min_max() const;
+	const pair<float, float> get_min_max() const;
 
-	SegmentAnalogDataIterator* begin_sample_iteration(uint64_t start) const;
-	void continue_sample_iteration(SegmentAnalogDataIterator* it, uint64_t increase) const;
-	void end_sample_iteration(SegmentAnalogDataIterator* it) const;
+	SegmentAnalogDataIterator* begin_sample_iteration(uint64_t start);
+	void continue_sample_iteration(SegmentAnalogDataIterator* it, uint64_t increase);
+	void end_sample_iteration(SegmentAnalogDataIterator* it);
 
 	void get_envelope_section(EnvelopeSection &s,
 		uint64_t start, uint64_t end, float min_length) const;