X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=747a16dcd16b9865e94fd70162a218eddd784f99;hb=83b9c07b79b30c1a76a10234dc01d3a5d48eba56;hp=57887f1ec7609c5f66702db71481991f13c77644;hpb=a3ebd5561086f4fef6570b3ab5be0a5592724731;p=pulseview.git

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 57887f1..747a16d 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;
@@ -79,7 +79,6 @@ private:
 	static const double DecodeMargin;
 	static const double DecodeThreshold;
 	static const int64_t DecodeChunkLength;
-	static const unsigned int DecodeNotifyPeriod;
 
 public:
 	DecodeSignal(pv::Session &session);
@@ -88,7 +87,7 @@ public:
 	bool is_decode_signal() const;
 	const vector< shared_ptr<data::decode::Decoder> >& decoder_stack() const;
 
-	void stack_decoder(srd_decoder *decoder);
+	void stack_decoder(const srd_decoder *decoder);
 	void remove_decoder(int index);
 	bool toggle_decoder_visibility(int index);
 
@@ -97,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;
 
@@ -129,13 +128,6 @@ public:
 
 	virtual void restore_settings(QSettings &settings);
 
-	/**
-	 * Helper function for static annotation_callback(),
-	 * must be public so the function can access it.
-	 * Don't use from outside this class.
-	 */
-	uint64_t inc_annotation_count();
-
 private:
 	void update_channel_list();
 
@@ -160,10 +152,12 @@ private:
 
 Q_SIGNALS:
 	void new_annotations();
+	void decode_finished();
 	void channels_updated();
 
 private Q_SLOTS:
 	void on_capture_state_changed(int state);
+	void on_data_cleared();
 	void on_data_received();
 
 private:
@@ -174,26 +168,18 @@ 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_;
 	double samplerate_;
 
-	int64_t annotation_count_, samples_decoded_;
+	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_;
-
 	mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
 	mutable condition_variable decode_input_cond_, logic_mux_cond_;
 	bool frame_complete_;