X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fdecoderstack.h;h=073f2692565da5db9f0024d74ae4f5cb9581c48e;hb=f70d8673a56471c7e4b22159b99684da7d6c4be1;hp=6391e6a88ceb0b2d4c57e41f85591401446bf531;hpb=bdc5c3b09d09781aa50ae3b128b2a7c6e2a53d5b;p=pulseview.git

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index 6391e6a8..073f2692 100644
--- a/pv/data/decoderstack.h
+++ b/pv/data/decoderstack.h
@@ -25,6 +25,7 @@
 
 #include <list>
 
+#include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
@@ -38,6 +39,7 @@ struct srd_decoder;
 struct srd_decoder_annotation_row;
 struct srd_probe;
 struct srd_proto_data;
+struct srd_session;
 
 namespace DecoderStackTest {
 class TwoDecoderStack;
@@ -53,6 +55,8 @@ class LogicSignal;
 
 namespace data {
 
+class LogicSnapshot;
+
 namespace decode {
 class Annotation;
 class Decoder;
@@ -100,11 +104,23 @@ public:
 	void begin_decode();
 
 private:
+	boost::optional<int64_t> wait_for_data() const;
+
+	void decode_data(const int64_t sample_count,
+		const unsigned int unit_size, srd_session *const session);
+
 	void decode_proc(boost::shared_ptr<data::Logic> data);
 
 	static void annotation_callback(srd_proto_data *pdata,
 		void *decoder);
 
+private slots:
+	void on_new_frame();
+
+	void on_data_received();
+
+	void on_frame_ended();
+
 signals:
 	void new_decode_data();
 
@@ -121,7 +137,14 @@ private:
 
 	std::list< boost::shared_ptr<decode::Decoder> > _stack;
 
-	mutable boost::mutex _mutex;
+	boost::shared_ptr<pv::data::LogicSnapshot> _snapshot;
+
+	mutable boost::mutex _input_mutex;
+	mutable boost::condition_variable _input_cond;
+	int64_t _sample_count;
+	bool _frame_complete;
+
+	mutable boost::mutex _output_mutex;
 	int64_t	_samples_decoded;
 
 	std::map<const decode::Row, decode::RowData> _rows;