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.h
diff --git
a/pv/data/decoderstack.h
b/pv/data/decoderstack.h
index 029ca25c21c91350c7709074aacd6c7a758ff88d..e2139f5b5ca94969e4d704a6cc50ae8024af78c4 100644
(file)
--- a/
pv/data/decoderstack.h
+++ b/
pv/data/decoderstack.h
@@
-43,16
+43,12
@@
namespace pv {
namespace view {
class LogicSignal;
namespace view {
class LogicSignal;
-
-namespace decode {
-class Annotation;
-}
-
}
namespace data {
namespace decode {
}
namespace data {
namespace decode {
+class Annotation;
class Decoder;
}
class Decoder;
}
@@
-78,13
+74,14
@@
public:
int64_t samples_decoded() const;
int64_t samples_decoded() const;
- const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
- annotations() const;
+ const std::vector<pv::data::decode::Annotation> annotations() const;
QString error_message();
void clear();
QString error_message();
void clear();
+ uint64_t get_max_sample_count() const;
+
void begin_decode();
private:
void begin_decode();
private:
@@
-110,8
+107,7
@@
private:
mutable boost::mutex _mutex;
int64_t _samples_decoded;
mutable boost::mutex _mutex;
int64_t _samples_decoded;
- std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
- _annotations;
+ std::vector<pv::data::decode::Annotation> _annotations;
QString _error_message;
boost::thread _decode_thread;
QString _error_message;
boost::thread _decode_thread;