projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce DecodeSignal class
[pulseview.git]
/
pv
/
data
/
decoderstack.hpp
diff --git
a/pv/data/decoderstack.hpp
b/pv/data/decoderstack.hpp
index 5216006ef4b5567a543fe36b4afa46721ea535de..37e4888f4ee28767d675b0161f081344fe972c0b 100644
(file)
--- a/
pv/data/decoderstack.hpp
+++ b/
pv/data/decoderstack.hpp
@@
-103,6
+103,13
@@
public:
vector<decode::Row> get_visible_rows() const;
vector<decode::Row> get_visible_rows() const;
+ /**
+ * Helper function for static annotation_callback(),
+ * must be public so the function can access it.
+ * Don't use from outside this class.
+ */
+ uint64_t inc_annotation_count();
+
/**
* Extracts sorted annotations between two period into a vector.
*/
/**
* Extracts sorted annotations between two period into a vector.
*/
@@
-127,7
+134,7
@@
private:
void decode_proc();
void decode_proc();
- static void annotation_callback(srd_proto_data *pdata, void *decoder);
+ static void annotation_callback(srd_proto_data *pdata, void *decoder
_stack
);
private Q_SLOTS:
void on_new_frame();
private Q_SLOTS:
void on_new_frame();
@@
-137,7
+144,7
@@
private Q_SLOTS:
void on_frame_ended();
Q_SIGNALS:
void on_frame_ended();
Q_SIGNALS:
- void new_
decode_data
();
+ void new_
annotations
();
private:
pv::Session &session_;
private:
pv::Session &session_;
@@
-159,7
+166,7
@@
private:
mutable mutex input_mutex_;
mutable condition_variable input_cond_;
mutable mutex input_mutex_;
mutable condition_variable input_cond_;
- int64_t sample_count_;
+ int64_t sample_count_
, annotation_count_
;
bool frame_complete_;
mutable mutex output_mutex_;
bool frame_complete_;
mutable mutex output_mutex_;