X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=4a1e7f005c671a3bf553a42c407b0eee4fc327a2;hb=cab7bc996c9c87120b0c551caa47d8dd53d84ea9;hp=90c06de4972ebc2268ad943ac5ec87b07fdeb3fc;hpb=72435789a077273d96260f0225f79171e679359e;p=pulseview.git

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 90c06de..4a1e7f0 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,26 +139,32 @@ 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;
+
 	void update_channel_list();
 
 	void commit_decoder_channels();
 
-	void mux_logic_samples(const int64_t start, const int64_t end);
+	void mux_logic_samples(uint32_t segment_id, const int64_t start, const int64_t end);
 
 	void logic_mux_proc();
 
-	void query_input_metadata();
-
-	void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count);
+	void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
+		const shared_ptr<LogicSegment> input_segment);
 
 	void decode_proc();
 
 	void start_srd_session();
+	void terminate_srd_session();
 	void stop_srd_session();
 
 	void connect_input_notifiers();
 
-	void create_new_segment();
+	void create_decode_segment();
 
 	static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 
@@ -179,18 +187,15 @@ private:
 	struct srd_session *srd_session_;
 
 	shared_ptr<Logic> logic_mux_data_;
-	shared_ptr<LogicSegment> logic_mux_segment_;
-	uint32_t logic_unit_size_;
+	uint32_t logic_mux_unit_size_;
 	bool logic_mux_data_invalid_;
 
-	uint32_t currently_processed_segment_;
-
 	vector< shared_ptr<decode::Decoder> > stack_;
+	bool stack_config_changed_;
 	map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
 	vector<DecodeSegment> segments_;
 	uint32_t current_segment_id_;
-	DecodeSegment *current_segment_;
 
 	mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
 	mutable condition_variable decode_input_cond_, logic_mux_cond_;