Modified Decode to only use LogicSignals

[pulseview.git] / pv / data / decoder.h

diff --git a/pv/data/decoder.h b/pv/data/decoder.h
index 4cae427ea95813e842be6aaa25fb93641ee0de1d..cdeb7e7a59adc0a449937a7df5ec51a02d73f601 100644 (file)
--- 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;