X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoder.h;h=cdeb7e7a59adc0a449937a7df5ec51a02d73f601;hb=3045c869ada2e32bf55cbb68633b5213b9b11e28;hp=c881403b42e22f8f1391d4d80c94e2ecaee1cf12;hpb=9cef95672622f4ecdb21edef9d81a10c789daf1e;p=pulseview.git diff --git a/pv/data/decoder.h b/pv/data/decoder.h index c881403..cdeb7e7 100644 --- a/pv/data/decoder.h +++ b/pv/data/decoder.h @@ -30,14 +30,18 @@ #include +#include + 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,7 @@ private: public: Decoder(const srd_decoder *const decoder, std::map > probes, + boost::shared_ptr > probes, GHashTable *options); virtual ~Decoder(); @@ -76,7 +80,7 @@ public: private: void begin_decode(); - void init_decoder(); + bool init_decoder(); void decode_proc(boost::shared_ptr data); @@ -88,10 +92,11 @@ signals: private: const srd_decoder *const _decoder; - std::map > + std::map > _probes; GHashTable *_options; + srd_session *_session; srd_decoder_inst *_decoder_inst; mutable boost::mutex _annotations_mutex;