X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.hpp;h=f2c6793bbbb789c286aa5e90b3519ddad8753a2c;hb=1ed996b433f3391f54846784d76da4fe6b07500f;hp=820959d454bbc6c2094f129a52299046c8cba995;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f;p=pulseview.git
diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp
index 820959d..f2c6793 100644
--- a/pv/data/decode/rowdata.hpp
+++ b/pv/data/decode/rowdata.hpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_DATA_DECODE_ROWDATA_HPP
@@ -23,8 +22,12 @@
#include
+#include
+
#include "annotation.hpp"
+using std::vector;
+
namespace pv {
namespace data {
namespace decode {
@@ -32,26 +35,28 @@ namespace decode {
class RowData
{
public:
- RowData();
+ RowData() = default;
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