X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=9bbdd2c4e2c9d68e21d69782f5d2e78ecc0e7000;hp=1455274af33877a56ca7ffe91e3ac403ef143aab;hb=b82908abf7353c7401cd67e82325922960d5d546;hpb=e32025579dc2ac0bbb78f87ef241c4b4c5f8fc9c

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 1455274a..9bbdd2c4 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -76,7 +76,7 @@ struct DecodeSegment
 	map<const decode::Row, decode::RowData> annotation_rows;
 	pv::util::Timestamp start_time;
 	double samplerate;
-	int64_t samples_decoded;
+	int64_t samples_decoded_incl, samples_decoded_excl;
 };
 
 class DecodeSignal : public SignalBase
@@ -99,7 +99,7 @@ public:
 	void remove_decoder(int index);
 	bool toggle_decoder_visibility(int index);
 
-	void reset_decode();
+	void reset_decode(bool shutting_down = false);
 	void begin_decode();
 	QString error_message() const;
 
@@ -120,12 +120,23 @@ public:
 	 */
 	int64_t get_working_sample_count(uint32_t segment_id) const;
 
-	int64_t get_decoded_sample_count(uint32_t segment_id) const;
+	/**
+	 * Returns the number of processed samples. Newly generated annotations will
+	 * have sample numbers greater than this.
+	 *
+	 * If include_processing is true, this number will include the ones being
+	 * currently processed (in case the decoder stack is running). In this case,
+	 * newly generated annotations will have sample numbers smaller than this.
+	 */
+	int64_t get_decoded_sample_count(uint32_t segment_id,
+		bool include_processing) const;
 
 	vector<decode::Row> visible_rows() 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(
 		vector<pv::data::decode::Annotation> &dest,
@@ -137,6 +148,8 @@ public:
 	virtual void restore_settings(QSettings &settings);
 
 private:
+	void set_error_message(QString msg);
+
 	uint32_t get_input_segment_count() const;
 
 	uint32_t get_input_samplerate(uint32_t segment_id) const;