Moved annotation painting code into DecodeTrace, and moved Annotation in pv::data...

[pulseview.git] / pv / data / decoderstack.h

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index 8b9d29b2bf89e487c31bf12e030b98678d618e2c..e2139f5b5ca94969e4d704a6cc50ae8024af78c4 100644 (file)
--- 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;
 }
 
@@ -74,13 +70,17 @@ public:
 
        const std::list< boost::shared_ptr<decode::Decoder> >& stack() const;
        void push(boost::shared_ptr<decode::Decoder> decoder);
+       void remove(int index);
 
-       const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
-               annotations() const;
+       int64_t samples_decoded() const;
+
+       const std::vector<pv::data::decode::Annotation> annotations() const;
 
        QString error_message();
 
-       void clear_snapshots();
+       void clear();
+
+       uint64_t get_max_sample_count() const;
 
        void begin_decode();
 
@@ -106,8 +106,8 @@ private:
        std::list< boost::shared_ptr<decode::Decoder> > _stack;
 
        mutable boost::mutex _mutex;
-       std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
-               _annotations;
+       int64_t _samples_decoded;
+       std::vector<pv::data::decode::Annotation> _annotations;
        QString _error_message;
 
        boost::thread _decode_thread;