X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=c3bf26d25699c12135707b40512414c9ee0ef4f3;hp=9a13769ccf2a32ffbec850b88cf1225b5718a7bc;hb=8bd26d8b9c831b509ee3241ea4dac6f50c023622;hpb=1f763c17a87c0be8c52ac9ba99e3391b91ab6bdc diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 9a13769c..c3bf26d2 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -194,10 +194,10 @@ void DecoderStack::begin_decode() clear(); - // Check that all decoders have the required probes + // Check that all decoders have the required channels BOOST_FOREACH(const shared_ptr &dec, _stack) if (!dec->have_required_probes()) { - _error_message = tr("One or more required probes " + _error_message = tr("One or more required channels " "have not been specified"); return; } @@ -233,12 +233,12 @@ void DecoderStack::begin_decode() } } - // We get the logic data of the first probe in the list. + // We get the logic data of the first channel in the list. // This works because we are currently assuming all // LogicSignals have the same data/snapshot BOOST_FOREACH (const shared_ptr &dec, _stack) - if (dec && !dec->probes().empty() && - ((logic_signal = (*dec->probes().begin()).second)) && + if (dec && !dec->channels().empty() && + ((logic_signal = (*dec->channels().begin()).second)) && ((data = logic_signal->logic_data()))) break;