X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoder.h;h=cdeb7e7a59adc0a449937a7df5ec51a02d73f601;hb=3045c869ada2e32bf55cbb68633b5213b9b11e28;hp=4cae427ea95813e842be6aaa25fb93641ee0de1d;hpb=e0fc58100fbcd6c3bfd5aecb213d7541a3436622;p=pulseview.git

diff --git a/pv/data/decoder.h b/pv/data/decoder.h
index 4cae427..cdeb7e7 100644
--- a/pv/data/decoder.h
+++ b/pv/data/decoder.h
@@ -30,14 +30,18 @@
 
 #include <QObject>
 
+#include <glib.h>
+
 struct srd_decoder;
 struct srd_decoder_inst;
 struct srd_probe;
+struct srd_proto_data;
+struct srd_session;
 
 namespace pv {
 
 namespace view {
-class Signal;
+class LogicSignal;
 
 namespace decode {
 class Annotation;
@@ -61,7 +65,8 @@ 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();
 
@@ -75,18 +80,23 @@ public:
 private:
 	void begin_decode();
 
-	void init_decoder();
+	bool init_decoder();
 
 	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:
 	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_session *_session;
 	srd_decoder_inst *_decoder_inst;
 
 	mutable boost::mutex _annotations_mutex;