X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=3187c850216dc1a4331bcca40d0b2ab504a01331;hp=d859ea0cdb665a9979d26685f639dbebca578333;hb=4913560f88d24909bab12177d7194314df1c9892;hpb=c8e60bdf0f33b3005e695a6b256b559dbc7b8576

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index d859ea0c..3187c850 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -40,7 +40,6 @@ using std::condition_variable;
 using std::map;
 using std::mutex;
 using std::pair;
-using std::unordered_set;
 using std::vector;
 using std::shared_ptr;
 
@@ -62,7 +61,8 @@ class SignalData;
 
 struct DecodeChannel
 {
-	uint16_t id;  // Also tells which bit within a sample represents this channel
+	uint16_t id;     ///< Global numerical ID for the decode channels in the stack
+	uint16_t bit_id; ///< Tells which bit within a sample represents this channel
 	const bool is_optional;
 	const pv::data::SignalBase *assigned_signal;
 	const QString name, desc;
@@ -96,7 +96,7 @@ public:
 	QString error_message() const;
 
 	const vector<data::DecodeChannel> get_channels() const;
-	void auto_assign_signals();
+	void auto_assign_signals(const shared_ptr<pv::data::decode::Decoder> dec);
 	void assign_signal(const uint16_t channel_id, const SignalBase *signal);
 	int get_assigned_signal_count() const;
 
@@ -148,6 +148,7 @@ private:
 
 	void connect_input_notifiers();
 
+	void prepare_annotation_segment();
 	static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 
 Q_SIGNALS:
@@ -168,7 +169,7 @@ private:
 	struct srd_session *srd_session_;
 
 	shared_ptr<Logic> logic_mux_data_;
-	shared_ptr<LogicSegment> segment_;
+	shared_ptr<LogicSegment> logic_mux_segment_;
 	bool logic_mux_data_invalid_;
 
 	pv::util::Timestamp start_time_;
@@ -177,16 +178,13 @@ private:
 	int64_t samples_decoded_;
 
 	vector< shared_ptr<decode::Decoder> > stack_;
-	map<const decode::Row, decode::RowData> rows_;
 	map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
-	/**
-	 * This mutex prevents more than one thread from accessing
-	 * libsigrokdecode concurrently.
-	 * @todo A proper solution should be implemented to allow multiple
-	 * decode operations in parallel.
-	 */
-	static mutex global_srd_mutex_;
+	/// Annotations for all segments
+	vector< map<const decode::Row, decode::RowData>> rows_;
+
+	/// Set of annotations for current segment
+	map<const decode::Row, decode::RowData> *current_rows_;
 
 	mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
 	mutable condition_variable decode_input_cond_, logic_mux_cond_;