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

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

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 6d5e4e19440a4f154abb8fceb1e0824ccbf83b8f..c2ae9116856161a94826db1adeadcfe9366d647b 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -32,8 +32,8 @@
 #include <pv/data/logic.h>
 #include <pv/data/logicsnapshot.h>
 #include <pv/data/decode/decoder.h>
+#include <pv/data/decode/annotation.h>
 #include <pv/view/logicsignal.h>
-#include <pv/view/decode/annotation.h>
 
 using namespace boost;
 using namespace std;
@@ -94,8 +94,7 @@ int64_t DecoderStack::samples_decoded() const
        return _samples_decoded;
 }
 
-const vector< shared_ptr<view::decode::Annotation> >
-       DecoderStack::annotations() const
+const vector<decode::Annotation> DecoderStack::annotations() const
 {
        lock_guard<mutex> lock(_mutex);
        return _annotations;
@@ -150,7 +149,7 @@ uint64_t DecoderStack::get_max_sample_count() const
 {
        if (_annotations.empty())
                return 0;
-       return _annotations.back()->end_sample();
+       return _annotations.back().end_sample();
 }
 
 void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
@@ -230,16 +229,15 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
 void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 {
-       using namespace pv::view::decode;
+       using pv::data::decode::Annotation;
 
        assert(pdata);
        assert(decoder);
 
        DecoderStack *const d = (DecoderStack*)decoder;
 
-       shared_ptr<Annotation> a(new Annotation(pdata));
        lock_guard<mutex> lock(d->_mutex);
-       d->_annotations.push_back(a);
+       d->_annotations.push_back(Annotation(pdata));
 
        d->new_decode_data();
 }