X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=e588ad6b9bf173be8791b5ee392b6c2f574659d4;hp=6d5e4e19440a4f154abb8fceb1e0824ccbf83b8f;hb=db62bbfda512aeddca5b9d7b5960e9cf24b8859c;hpb=6ad174e055b76e5dd68014382c80f7137e8320b9 diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index 6d5e4e19..e588ad6b 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -94,8 +94,7 @@ int64_t DecoderStack::samples_decoded() const return _samples_decoded; } -const vector< shared_ptr > - DecoderStack::annotations() const +const vector DecoderStack::annotations() const { lock_guard 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) @@ -237,9 +236,8 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder) DecoderStack *const d = (DecoderStack*)decoder; - shared_ptr a(new Annotation(pdata)); lock_guard lock(d->_mutex); - d->_annotations.push_back(a); + d->_annotations.push_back(Annotation(pdata)); d->new_decode_data(); }