X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.hpp;h=37e4888f4ee28767d675b0161f081344fe972c0b;hp=5216006ef4b5567a543fe36b4afa46721ea535de;hb=946b52e1f0e0520415c3653cc6ea9d083718f76d;hpb=c063290ac7189bdd15221450f598504f43286b43

diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index 5216006e..37e4888f 100644
--- a/pv/data/decoderstack.hpp
+++ b/pv/data/decoderstack.hpp
@@ -103,6 +103,13 @@ public:
 
 	vector<decode::Row> get_visible_rows() const;
 
+	/**
+	 * Helper function for static annotation_callback(),
+	 * must be public so the function can access it.
+	 * Don't use from outside this class.
+	 */
+	uint64_t inc_annotation_count();
+
 	/**
 	 * Extracts sorted annotations between two period into a vector.
 	 */
@@ -127,7 +134,7 @@ private:
 
 	void decode_proc();
 
-	static void annotation_callback(srd_proto_data *pdata, void *decoder);
+	static void annotation_callback(srd_proto_data *pdata, void *decoder_stack);
 
 private Q_SLOTS:
 	void on_new_frame();
@@ -137,7 +144,7 @@ private Q_SLOTS:
 	void on_frame_ended();
 
 Q_SIGNALS:
-	void new_decode_data();
+	void new_annotations();
 
 private:
 	pv::Session &session_;
@@ -159,7 +166,7 @@ private:
 
 	mutable mutex input_mutex_;
 	mutable condition_variable input_cond_;
-	int64_t sample_count_;
+	int64_t sample_count_, annotation_count_;
 	bool frame_complete_;
 
 	mutable mutex output_mutex_;