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 fe03df0aca3011f4f0d1d2c3a116621b6068e23c..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;
}
@@
-76,12
+72,15
@@
public:
void push(boost::shared_ptr<decode::Decoder> decoder);
void remove(int index);
void push(boost::shared_ptr<decode::Decoder> decoder);
void remove(int index);
- const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
- annotations() const;
+ int64_t samples_decoded() const;
+
+ const std::vector<pv::data::decode::Annotation> annotations() const;
QString error_message();
QString error_message();
- void clear_snapshots();
+ void clear();
+
+ uint64_t get_max_sample_count() const;
void begin_decode();
void begin_decode();
@@
-107,8
+106,8
@@
private:
std::list< boost::shared_ptr<decode::Decoder> > _stack;
mutable boost::mutex _mutex;
std::list< boost::shared_ptr<decode::Decoder> > _stack;
mutable boost::mutex _mutex;
- std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
-
_annotations;
+ int64_t _samples_decoded;
+
std::vector<pv::data::decode::Annotation>
_annotations;
QString _error_message;
boost::thread _decode_thread;
QString _error_message;
boost::thread _decode_thread;