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

diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp
index b6271111..01ea94f4 100644
--- a/pv/data/decode/rowdata.hpp
+++ b/pv/data/decode/rowdata.hpp
@@ -22,35 +22,46 @@
 
 #include <vector>
 
-#include "annotation.hpp"
+#include <libsigrokdecode/libsigrokdecode.h>
+
+#include <pv/data/decode/annotation.hpp>
+
+using std::deque;
+using std::vector;
 
 namespace pv {
 namespace data {
 namespace decode {
 
+class Row;
+
 class RowData
 {
 public:
-	RowData() = default;
+	RowData(Row* row);
 
-public:
 	uint64_t get_max_sample() const;
 
+	uint64_t get_annotation_count() const;
+
 	/**
-	 * Extracts sorted annotations between two period into a vector.
+	 * 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(
-		std::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 push_annotation(const Annotation &a);
+	void emplace_annotation(srd_proto_data *pdata);
 
 private:
-	std::vector<Annotation> annotations_;
+	deque<Annotation> annotations_;
+	Row* row_;
+	uint64_t prev_ann_start_sample_;
 };
 
-}
-} // data
-} // pv
+}  // namespace decode
+}  // namespace data
+}  // namespace pv
 
 #endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP