X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=1c47016055fddae6dda477713487836b34b52793;hb=360ab9be5d6060d05cd7d40f5a50f7eafb787290;hp=3d7341261dc896e5f0c0f23876eb212023bb7d0d;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 3d73412..1c47016 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -24,14 +24,14 @@ #include -#include "decoderstack.h" +#include "decoderstack.hpp" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include using std::lock_guard; using std::mutex; @@ -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), @@ -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())