projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeSignal: When lacking input, retry only when data is available
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.cpp
diff --git
a/pv/data/decode/annotation.cpp
b/pv/data/decode/annotation.cpp
index 7c720430e9d6cf7e6a688fd6c138cad2cd90589b..96a594c3c6ce57a07f621ce9ddf9cd439fed1acd 100644
(file)
--- a/
pv/data/decode/annotation.cpp
+++ b/
pv/data/decode/annotation.cpp
@@
-41,7
+41,7
@@
Annotation::Annotation(const srd_proto_data *const pdata) :
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
-
format_ = pda->ann_class
;
+
ann_class_ = (Class)(pda->ann_class)
;
const char *const *annotations = (char**)pda->ann_text;
while (*annotations) {
const char *const *annotations = (char**)pda->ann_text;
while (*annotations) {
@@
-60,9
+60,9
@@
uint64_t Annotation::end_sample() const
return end_sample_;
}
return end_sample_;
}
-
int Annotation::format
() const
+
Annotation::Class Annotation::ann_class
() const
{
{
- return
format
_;
+ return
ann_class
_;
}
const vector<QString>& Annotation::annotations() const
}
const vector<QString>& Annotation::annotations() const