X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.hpp;h=88576118d06eb180b281d0d8ee9a9b2f1def1e2c;hp=bc9c77d0f4c7b6923287967f3b189648c0c65459;hb=5b35d18ccf2e5a8949d1b4b37d06bf527480e547;hpb=04e1acc23e835018c3c13d8f29115cb285035151

diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index bc9c77d0..88576118 100644
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -54,37 +54,37 @@ typedef struct {
 	uint8_t* value;
 } SegmentLogicDataIterator;
 
-class LogicSegment : public QObject, public Segment
+class LogicSegment : public Segment
 {
 	Q_OBJECT
 
-private:
-	struct MipMapLevel
-	{
-		uint64_t length;
-		uint64_t data_length;
-		void *data;
-	};
+public:
+	typedef pair<int64_t, bool> EdgePair;
 
-private:
 	static const unsigned int ScaleStepCount = 10;
 	static const int MipMapScalePower;
 	static const int MipMapScaleFactor;
 	static const float LogMipMapScaleFactor;
 	static const uint64_t MipMapDataUnit;
 
-public:
-	typedef pair<int64_t, bool> EdgePair;
+private:
+	struct MipMapLevel
+	{
+		uint64_t length;
+		uint64_t data_length;
+		void *data;
+	};
 
 public:
-	LogicSegment(pv::data::Logic& owner, unsigned int unit_size, uint64_t samplerate);
+	LogicSegment(pv::data::Logic& owner, uint32_t segment_id,
+		unsigned int unit_size, uint64_t samplerate);
 
 	virtual ~LogicSegment();
 
 	void append_payload(shared_ptr<sigrok::Logic> logic);
 	void append_payload(void *data, uint64_t data_size);
 
-	const uint8_t* get_samples(int64_t start_sample, int64_t end_sample) const;
+	void get_samples(int64_t start_sample, int64_t end_sample, uint8_t* dest) const;
 
 	SegmentLogicDataIterator* begin_sample_iteration(uint64_t start);
 	void continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase);
@@ -93,7 +93,7 @@ public:
 private:
 	uint64_t unpack_sample(const uint8_t *ptr) const;
 	void pack_sample(uint8_t *ptr, uint64_t value);
-	
+
 	void reallocate_mipmap_level(MipMapLevel &m);
 
 	void append_payload_to_mipmap();