X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoder.h;h=72ccd2ec58622a9119f6e3f15ddbd2d1fa45e831;hb=ce94e4fd5d7ab666259231d21759613f1f2b93ee;hp=dcf12fe1d4b5d2b8c6696442682bc9f5217ea2e6;hpb=640d69ce065e5c5a30e83395b259a63f7e03c779;p=pulseview.git

diff --git a/pv/data/decoder.h b/pv/data/decoder.h
index dcf12fe..72ccd2e 100644
--- a/pv/data/decoder.h
+++ b/pv/data/decoder.h
@@ -28,48 +28,100 @@
 #include <boost/shared_ptr.hpp>
 #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;
+}
+
 }
 
 namespace data {
 
 class Logic;
 
-class Decoder : public SignalData
+class Decoder : public QObject, public SignalData
 {
+	Q_OBJECT
+
+private:
+	static const double DecodeMargin;
+	static const double DecodeThreshold;
+	static const int64_t DecodeChunkLength;
+
 public:
-	Decoder(const srd_decoder *const decoder,
-		std::map<const srd_probe*,
-			boost::shared_ptr<pv::view::Signal> > probes);
+	Decoder(const srd_decoder *const decoder);
 
 	virtual ~Decoder();
 
-	const srd_decoder* get_decoder() const;
+	const srd_decoder* decoder() const;
 
-	void begin_decode();
+	const std::map<const srd_probe*, boost::shared_ptr<view::LogicSignal> >&
+		probes() const;
+	void set_probes(std::map<const srd_probe*,
+		boost::shared_ptr<view::LogicSignal> > probes);
+
+	const GHashTable* options() const;
+
+	void set_option(const char *id, GVariant *value);
+
+	const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
+		annotations() const;
+
+	QString error_message();
 
 	void clear_snapshots();
 
 private:
-	void init_decoder();
+	void begin_decode();
 
 	void decode_proc(boost::shared_ptr<data::Logic> data);
 
+	static void annotation_callback(srd_proto_data *pdata,
+		void *decoder);
+
+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 _mutex;
+	std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
+		_annotations;
+	QString _error_message;
 
 	boost::thread _decode_thread;
+
+	friend class DecoderTest::TwoDecoder;
 };
 
 } // namespace data