X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoder.h;h=b8608d2cc4290ed712722ba1e677e6383e96fb03;hp=c881403b42e22f8f1391d4d80c94e2ecaee1cf12;hb=fe89c96185dba8ccf02b6b3d0994c2e149198c73;hpb=9cef95672622f4ecdb21edef9d81a10c789daf1e

diff --git a/pv/data/decoder.h b/pv/data/decoder.h
index c881403b..b8608d2c 100644
--- a/pv/data/decoder.h
+++ b/pv/data/decoder.h
@@ -29,15 +29,22 @@
 #include <boost/thread.hpp>
 
 #include <QObject>
+#include <QString>
+
+#include <glib.h>
 
 struct srd_decoder;
-struct srd_decoder_inst;
 struct srd_probe;
+struct srd_proto_data;
+
+namespace DecoderTest {
+class TwoDecoder;
+}
 
 namespace pv {
 
 namespace view {
-class Signal;
+class LogicSignal;
 
 namespace decode {
 class Annotation;
@@ -61,7 +68,7 @@ private:
 public:
 	Decoder(const srd_decoder *const decoder,
 		std::map<const srd_probe*,
-			boost::shared_ptr<pv::view::Signal> > probes,
+			boost::shared_ptr<pv::view::LogicSignal> > probes,
 		GHashTable *options);
 
 	virtual ~Decoder();
@@ -71,6 +78,8 @@ public:
 	const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
 		annotations() const;
 
+	QString error_message();
+
 	void clear_snapshots();
 
 private:
@@ -87,18 +96,28 @@ signals:
 	void new_decode_data();
 
 private:
+
+	/**
+	 * This mutex prevents more than one decode operation occuring
+	 * concurrently.
+	 * @todo A proper solution should be implemented to allow multiple
+	 * decode operations.
+	 */
+	static boost::mutex _global_decode_mutex;
+
 	const srd_decoder *const _decoder;
-	std::map<const srd_probe*, boost::shared_ptr<view::Signal> >
+	std::map<const srd_probe*, boost::shared_ptr<view::LogicSignal> >
 		_probes;
 	GHashTable *_options;
 
-	srd_decoder_inst *_decoder_inst;
-
-	mutable boost::mutex _annotations_mutex;
+	mutable boost::mutex _mutex;
 	std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
 		_annotations;
+	QString _error_message;
 
 	boost::thread _decode_thread;
+
+	friend class DecoderTest::TwoDecoder;
 };
 
 } // namespace data