X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.h;h=3920aa4c40012f4313631984c434d6cd3d14ed66;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hp=0c3662cb5f75604aa0bf7cbd89ad94c4a3a67344;hpb=ddee4cf8c09fa27c329084b8706a984995648056;p=pulseview.git diff --git a/pv/data/decode/decoder.h b/pv/data/decode/decoder.h index 0c3662c..3920aa4 100644 --- a/pv/data/decode/decoder.h +++ b/pv/data/decode/decoder.h @@ -22,15 +22,14 @@ #define PULSEVIEW_PV_DATA_DECODE_DECODER_H #include +#include #include -#include - #include struct srd_decoder; struct srd_decoder_inst; -struct srd_probe; +struct srd_channel; struct srd_session; namespace pv { @@ -57,10 +56,10 @@ public: bool shown() const; void show(bool show = true); - const std::map >& probes() const; - void set_probes(std::map > probes); + const std::map >& channels() const; + void set_probes(std::map > probes); const std::map& options() const; @@ -71,14 +70,14 @@ public: srd_decoder_inst* create_decoder_inst( srd_session *session, int unit_size) const; - std::set< boost::shared_ptr > get_data(); + std::set< std::shared_ptr > get_data(); private: const srd_decoder *const _decoder; bool _shown; - std::map > + std::map > _probes; std::map _options; };