X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.h;h=e2139f5b5ca94969e4d704a6cc50ae8024af78c4;hp=fe03df0aca3011f4f0d1d2c3a116621b6068e23c;hb=06e810f29b6e9e3fe8ba8aba5d3823375da9bbb2;hpb=613d097c5af2d12ffd68e2dfab309b518edca1a6 diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h index fe03df0a..e2139f5b 100644 --- a/pv/data/decoderstack.h +++ b/pv/data/decoderstack.h @@ -43,16 +43,12 @@ namespace pv { namespace view { class LogicSignal; - -namespace decode { -class Annotation; -} - } namespace data { namespace decode { +class Annotation; class Decoder; } @@ -76,12 +72,15 @@ public: void push(boost::shared_ptr decoder); void remove(int index); - const std::vector< boost::shared_ptr > - annotations() const; + int64_t samples_decoded() const; + + const std::vector annotations() const; QString error_message(); - void clear_snapshots(); + void clear(); + + uint64_t get_max_sample_count() const; void begin_decode(); @@ -107,8 +106,8 @@ private: std::list< boost::shared_ptr > _stack; mutable boost::mutex _mutex; - std::vector< boost::shared_ptr > - _annotations; + int64_t _samples_decoded; + std::vector _annotations; QString _error_message; boost::thread _decode_thread;