X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=4a1e7f005c671a3bf553a42c407b0eee4fc327a2;hp=4f2253d1716091e8a231a8be702a9d5cf0c79cec;hb=4caaaacee32e9a8145968891eb9cd9225260530f;hpb=ce0b6a40ca6f804fd6ae7dcce2bbe163848819aa

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 4f2253d1..4a1e7f00 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -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;
 
@@ -125,7 +125,9 @@ public:
 	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 +139,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;
@@ -187,6 +191,7 @@ private:
 	bool logic_mux_data_invalid_;
 
 	vector< shared_ptr<decode::Decoder> > stack_;
+	bool stack_config_changed_;
 	map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
 	vector<DecodeSegment> segments_;