X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fanalogsegment.hpp;h=df25f0b74a669109663a08e0df4dbeff3b5a7641;hb=152a0b1b4e19dc3d8b816851abc82813d891b363;hp=09ae2c0203dfa65d4c36c8a791754e9379e7804b;hpb=73e377feaaf01e790c87a4a0c918a36e87a9a6b9;p=pulseview.git

diff --git a/pv/data/analogsegment.hpp b/pv/data/analogsegment.hpp
index 09ae2c0..df25f0b 100644
--- a/pv/data/analogsegment.hpp
+++ b/pv/data/analogsegment.hpp
@@ -25,6 +25,10 @@
 #include <utility>
 #include <vector>
 
+#include <QObject>
+
+using std::pair;
+
 namespace AnalogSegmentTest {
 struct Basic;
 }
@@ -32,14 +36,12 @@ struct Basic;
 namespace pv {
 namespace data {
 
-typedef struct {
-	uint64_t sample_index, chunk_num, chunk_offs;
-	uint8_t* chunk;
-	float* value;
-} SegmentAnalogDataIterator;
+class Analog;
 
 class AnalogSegment : public Segment
 {
+	Q_OBJECT
+
 public:
 	struct EnvelopeSample
 	{
@@ -71,21 +73,18 @@ private:
 	static const uint64_t EnvelopeDataUnit;
 
 public:
-	AnalogSegment(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;
+	float* get_iterator_value_ptr(SegmentDataIterator* it);
 
 	void get_envelope_section(EnvelopeSection &s,
 		uint64_t start, uint64_t end, float min_length) const;
@@ -96,6 +95,8 @@ private:
 	void append_payload_to_envelope_levels();
 
 private:
+	Analog& owner_;
+
 	struct Envelope envelope_levels_[ScaleStepCount];
 
 	float min_value_, max_value_;