X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.hpp;h=01ea94f4586c7390601c28ea61e68c76a5ca960d;hb=761f8302350c52f2cf357f49e1084e7101c70497;hp=0589ec894eb444fad4f2d0d759c98a1eabc13fc7;hpb=5a914348e8c95f92fd7c1c5988d563c5fb472aa2;p=pulseview.git

diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp
index 0589ec89..01ea94f4 100644
--- a/pv/data/decode/rowdata.hpp
+++ b/pv/data/decode/rowdata.hpp
@@ -24,8 +24,9 @@
 
 #include <libsigrokdecode/libsigrokdecode.h>
 
-#include "annotation.hpp"
+#include <pv/data/decode/annotation.hpp>
 
+using std::deque;
 using std::vector;
 
 namespace pv {
@@ -37,24 +38,26 @@ class Row;
 class RowData
 {
 public:
-	RowData() = default;
+	RowData(Row* row);
 
-public:
 	uint64_t get_max_sample() const;
 
+	uint64_t get_annotation_count() const;
+
 	/**
 	 * Extracts annotations between the given sample range into a vector.
 	 * Note: The annotations are unsorted and only annotations that fully
 	 * fit into the sample range are considered.
 	 */
-	void get_annotation_subset(
-		vector<pv::data::decode::Annotation> &dest,
+	void get_annotation_subset(deque<const pv::data::decode::Annotation*> &dest,
 		uint64_t start_sample, uint64_t end_sample) const;
 
-	void emplace_annotation(srd_proto_data *pdata, const Row *row);
+	void emplace_annotation(srd_proto_data *pdata);
 
 private:
-	vector<Annotation> annotations_;
+	deque<Annotation> annotations_;
+	Row* row_;
+	uint64_t prev_ann_start_sample_;
 };
 
 }  // namespace decode