X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=6d5e4e19440a4f154abb8fceb1e0824ccbf83b8f;hb=903038a8c9496b23d29535dd8c41a6c207c0831b;hp=d6fa17cafe8b6780239be558eeec88486923c1be;hpb=5dfeb70fc60f1c4752697d8ad6f80e1415213197;p=pulseview.git diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index d6fa17ca..6d5e4e19 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -125,7 +125,7 @@ void DecoderStack::begin_decode() BOOST_FOREACH (const shared_ptr &dec, _stack) if (dec && !dec->probes().empty() && ((logic_signal = (*dec->probes().begin()).second)) && - ((data = logic_signal->data()))) + ((data = logic_signal->logic_data()))) break; if (!data) @@ -133,7 +133,7 @@ void DecoderStack::begin_decode() // Get the samplerate and start time _start_time = data->get_start_time(); - _samplerate = data->get_samplerate(); + _samplerate = data->samplerate(); if (_samplerate == 0.0) _samplerate = 1.0; @@ -141,8 +141,16 @@ void DecoderStack::begin_decode() data); } -void DecoderStack::clear_snapshots() +void DecoderStack::clear() { + _annotations.clear(); +} + +uint64_t DecoderStack::get_max_sample_count() const +{ + if (_annotations.empty()) + return 0; + return _annotations.back()->end_sample(); } void DecoderStack::decode_proc(shared_ptr data)