X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.h;h=dffefab22e2119f6a44fc7a2dbe869196320d431;hb=8bd26d8b9c831b509ee3241ea4dac6f50c023622;hp=d8ed469203cf804ac1c2eabc215b80a1d024c993;hpb=13a3528cfa6ed4dc18c44aae2353ac145b0160cc;p=pulseview.git diff --git a/pv/data/decode/decoder.h b/pv/data/decode/decoder.h index d8ed469..dffefab 100644 --- a/pv/data/decode/decoder.h +++ b/pv/data/decode/decoder.h @@ -22,6 +22,7 @@ #define PULSEVIEW_PV_DATA_DECODE_DECODER_H #include +#include #include @@ -29,7 +30,7 @@ struct srd_decoder; struct srd_decoder_inst; -struct srd_probe; +struct srd_channel; struct srd_session; namespace pv { @@ -39,6 +40,9 @@ class LogicSignal; } namespace data { + +class Logic; + namespace decode { class Decoder @@ -53,9 +57,9 @@ public: bool shown() const; void show(bool show = true); - const std::map >& probes() const; - void set_probes(std::map >& channels() const; + void set_probes(std::map > probes); const std::map& options() const; @@ -67,12 +71,14 @@ public: srd_decoder_inst* create_decoder_inst( srd_session *session, int unit_size) const; + std::set< boost::shared_ptr > get_data(); + private: const srd_decoder *const _decoder; bool _shown; - std::map > + std::map > _probes; std::map _options; };