X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=19f11399fec78bae58fc809d71bfb6b0aded71d1;hp=14d298d24fd41b4835a9d0f9dc8ddc0222949805;hb=cbb2e4da8042495531b406f745ee9d9e20448ef6;hpb=8400211329afbb76fb71dfd969b1149e5a6d2ff4 diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp index 14d298d2..19f11399 100644 --- a/pv/data/decode/decoder.cpp +++ b/pv/data/decode/decoder.cpp @@ -37,7 +37,7 @@ namespace data { namespace decode { Decoder::Decoder(const srd_decoder *const dec) : - decoder_(dec), + srd_decoder_(dec), shown_(true), decoder_inst_(nullptr) { @@ -59,12 +59,12 @@ Decoder::~Decoder() const srd_decoder* Decoder::decoder() const { - return decoder_; + return srd_decoder_; } const char* Decoder::name() const { - return decoder_->name; + return srd_decoder_->name; } bool Decoder::shown() const @@ -144,7 +144,7 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) if (decoder_inst_) qDebug() << "WARNING: previous decoder instance" << decoder_inst_ << "exists"; - decoder_inst_ = srd_inst_new(session, decoder_->id, opt_hash); + decoder_inst_ = srd_inst_new(session, srd_decoder_->id, opt_hash); g_hash_table_destroy(opt_hash); if (!decoder_inst_)