projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 e588ad6b9bf173be8791b5ee392b6c2f574659d4..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/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/logicsignal.h>
-#include <pv/view/decode/annotation.h>
using namespace boost;
using namespace std;
using namespace boost;
using namespace std;
@@
-94,7
+94,7
@@
int64_t DecoderStack::samples_decoded() const
return _samples_decoded;
}
return _samples_decoded;
}
-const vector<
view::
decode::Annotation> DecoderStack::annotations() const
+const vector<decode::Annotation> DecoderStack::annotations() const
{
lock_guard<mutex> lock(_mutex);
return _annotations;
{
lock_guard<mutex> lock(_mutex);
return _annotations;
@@
-229,7
+229,7
@@
void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
{
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
{
- using
namespace pv::view::decode
;
+ using
pv::data::decode::Annotation
;
assert(pdata);
assert(decoder);
assert(pdata);
assert(decoder);