projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store annotations as objects emplaced in the vector
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index 6d5e4e19440a4f154abb8fceb1e0824ccbf83b8f..e588ad6b9bf173be8791b5ee392b6c2f574659d4 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-94,8
+94,7
@@
int64_t DecoderStack::samples_decoded() const
return _samples_decoded;
}
return _samples_decoded;
}
-const vector< shared_ptr<view::decode::Annotation> >
- DecoderStack::annotations() const
+const vector<view::decode::Annotation> DecoderStack::annotations() const
{
lock_guard<mutex> lock(_mutex);
return _annotations;
{
lock_guard<mutex> lock(_mutex);
return _annotations;
@@
-150,7
+149,7
@@
uint64_t DecoderStack::get_max_sample_count() const
{
if (_annotations.empty())
return 0;
{
if (_annotations.empty())
return 0;
- return _annotations.back()
->
end_sample();
+ return _annotations.back()
.
end_sample();
}
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
}
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
@@
-237,9
+236,8
@@
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
DecoderStack *const d = (DecoderStack*)decoder;
DecoderStack *const d = (DecoderStack*)decoder;
- shared_ptr<Annotation> a(new Annotation(pdata));
lock_guard<mutex> lock(d->_mutex);
lock_guard<mutex> lock(d->_mutex);
- d->_annotations.push_back(
a
);
+ d->_annotations.push_back(
Annotation(pdata)
);
d->new_decode_data();
}
d->new_decode_data();
}