X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=3d90f7f7de648e861d117fc24e8b1200b44fe952;hp=9c8d382c808a74087f9566cae9535f66fd4ced78;hb=762ab7a4b20928a784b2b3400ce748d901e32d2d;hpb=477472187338948c83bea5d790ead66034008296

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 9c8d382..3d90f7f 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -25,8 +25,6 @@
 #include <unordered_set>
 #include <vector>
 
-#include <boost/optional.hpp>
-
 #include <QSettings>
 #include <QString>
 
@@ -81,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);
@@ -90,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);
 
@@ -99,8 +96,9 @@ 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;
 
 	void set_initial_pin_state(const uint16_t channel_id, const int init_state);
 
@@ -130,41 +128,45 @@ 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();
 
+	void commit_decoder_channels();
+
+	void mux_logic_samples(const int64_t start, const int64_t end);
+
 	void logic_mux_proc();
 
-	boost::optional<int64_t> wait_for_data() const;
+	void query_input_metadata();
 
-	void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
-		srd_session *const session);
+	void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count);
 
 	void decode_proc();
 
+	void start_srd_session();
+	void stop_srd_session();
+
+	void connect_input_notifiers();
+
 	static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 
 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();
-	void on_frame_ended();
 
 private:
 	pv::Session &session_;
 
 	vector<data::DecodeChannel> channels_;
 
+	struct srd_session *srd_session_;
+
 	shared_ptr<Logic> logic_mux_data_;
 	shared_ptr<LogicSegment> segment_;
 	bool logic_mux_data_invalid_;
@@ -172,21 +174,13 @@ private:
 	pv::util::Timestamp start_time_;
 	double samplerate_;
 
-	int64_t sample_count_, 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_;
+	mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
 	mutable condition_variable decode_input_cond_, logic_mux_cond_;
 	bool frame_complete_;