X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=e0b16573430d8ef466309363af9e7b29ba9a8d1a;hb=1df18f6b6d20abd3f1ede94325b6781bf5038ea9;hp=5e30faa73c810e7d64e9bfb936e7cb6e8656daa8;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 5e30faa..e0b1657 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include using std::lock_guard; @@ -59,7 +59,7 @@ const unsigned int DecoderStack::DecodeNotifyPeriod = 65536; mutex DecoderStack::global_decode_mutex_; -DecoderStack::DecoderStack(pv::SigSession &session, +DecoderStack::DecoderStack(pv::Session &session, const srd_decoder *const dec) : session_(session), sample_count_(0), @@ -245,7 +245,7 @@ void DecoderStack::begin_decode() // Check we have a snapshot of data const deque< shared_ptr > &snapshots = - data->get_snapshots(); + data->logic_snapshots(); if (snapshots.empty()) return; snapshot_ = snapshots.front(); @@ -392,7 +392,7 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder) assert(decc); auto row_iter = d->rows_.end(); - + // Try looking up the sub-row of this class const auto r = d->class_rows_.find(make_pair(decc, a.format())); if (r != d->class_rows_.end())