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

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 9bbdd2c4..da66d528 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -101,6 +101,9 @@ public:
 
 	void reset_decode(bool shutting_down = false);
 	void begin_decode();
+	void pause_decode();
+	void resume_decode();
+	bool is_paused() const;
 	QString error_message() const;
 
 	const vector<data::DecodeChannel> get_channels() const;
@@ -131,11 +134,11 @@ public:
 	int64_t get_decoded_sample_count(uint32_t segment_id,
 		bool include_processing) const;
 
-	vector<decode::Row> visible_rows() const;
+	vector<decode::Row> get_rows(bool visible_only) const;
 
 	/**
-	 * Extracts annotations between the given sample range into a vector.
-	 * Note: The annotations are unsorted and only annotations that fully
+	 * Extracts annotations from a single row into a vector.
+	 * Note: The annotations may be unsorted and only annotations that fully
 	 * fit into the sample range are considered.
 	 */
 	void get_annotation_subset(
@@ -143,6 +146,15 @@ public:
 		const decode::Row &row, uint32_t segment_id, uint64_t start_sample,
 		uint64_t end_sample) const;
 
+	/**
+	 * Extracts annotations from all rows into a vector.
+	 * Note: The annotations may be unsorted and only annotations that fully
+	 * fit into the sample range are considered.
+	 */
+	void get_annotation_subset(
+		vector<pv::data::decode::Annotation> &dest,
+		uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const;
+
 	virtual void save_settings(QSettings &settings) const;
 
 	virtual void restore_settings(QSettings &settings);
@@ -206,12 +218,15 @@ private:
 	vector<DecodeSegment> segments_;
 	uint32_t current_segment_id_;
 
-	mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
-	mutable condition_variable decode_input_cond_, logic_mux_cond_;
+	mutable mutex input_mutex_, output_mutex_, decode_pause_mutex_, logic_mux_mutex_;
+	mutable condition_variable decode_input_cond_, decode_pause_cond_,
+		logic_mux_cond_;
 
 	std::thread decode_thread_, logic_mux_thread_;
 	atomic<bool> decode_interrupt_, logic_mux_interrupt_;
 
+	bool decode_paused_;
+
 	QString error_message_;
 };