Session: Fix issue #67 by improving error handling

[pulseview.git] / pv / data / analogsegment.hpp

diff --git a/pv/data/analogsegment.hpp b/pv/data/analogsegment.hpp
index e6c312ade78d3b7157b43cc2f9584ba283381edb..633170439b8b0b0cc40372b1c538e4ec38b7501e 100644 (file)
--- a/pv/data/analogsegment.hpp
+++ b/pv/data/analogsegment.hpp
@@ -27,6 +27,9 @@
 
 #include <QObject>
 
+using std::enable_shared_from_this;
+using std::pair;
+
 namespace AnalogSegmentTest {
 struct Basic;
 }
@@ -36,13 +39,7 @@ namespace data {
 
 class Analog;
 
-typedef struct {
-       uint64_t sample_index, chunk_num, chunk_offs;
-       uint8_t* chunk;
-       float* value;
-} SegmentAnalogDataIterator;
-
-class AnalogSegment : public QObject, public Segment
+class AnalogSegment : public Segment, public enable_shared_from_this<Segment>
 {
        Q_OBJECT
 
@@ -77,21 +74,19 @@ 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;
+       float get_sample(int64_t sample_num) 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;