X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.hpp;h=f2c6793bbbb789c286aa5e90b3519ddad8753a2c;hb=4caaaacee32e9a8145968891eb9cd9225260530f;hp=b62711117d0c1a0066ad05570ca6ad7623e3073b;hpb=8b2eb22ed4f467f5364e8e9824a12137e2433b7e;p=pulseview.git diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp index b627111..f2c6793 100644 --- a/pv/data/decode/rowdata.hpp +++ b/pv/data/decode/rowdata.hpp @@ -22,8 +22,12 @@ #include +#include + #include "annotation.hpp" +using std::vector; + namespace pv { namespace data { namespace decode { @@ -37,20 +41,22 @@ public: uint64_t get_max_sample() 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 &dest, + vector &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 annotations_; + vector annotations_; }; -} -} // data -} // pv +} // namespace decode +} // namespace data +} // namespace pv #endif // PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP