projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeSignal: Allow muxed logic data to be cached
[pulseview.git]
/
pv
/
data
/
decodesignal.hpp
diff --git
a/pv/data/decodesignal.hpp
b/pv/data/decodesignal.hpp
index 0a28fe3c5324eba3fcaf230910a38071c06f578b..29e8441a83785ee62628959d4676791f90456b27 100644
(file)
--- a/
pv/data/decodesignal.hpp
+++ b/
pv/data/decodesignal.hpp
@@
-148,7
+148,7
@@
private:
void connect_input_notifiers();
void connect_input_notifiers();
- void
prepare
_annotation_segment();
+ void
create_new
_annotation_segment();
static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
Q_SIGNALS:
static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
Q_SIGNALS:
@@
-183,10
+183,10
@@
private:
map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
/// Annotations for all segments
map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
/// Annotations for all segments
- vector< map<const decode::Row, decode::RowData>> rows_;
+ vector< map<const decode::Row, decode::RowData>>
segmented_
rows_;
/// Set of annotations for current segment
/// Set of annotations for current segment
- map<const decode::Row, decode::RowData> *current_rows_;
// TODO Multiple segment support
+ map<const decode::Row, decode::RowData> *current_rows_;
mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
mutable condition_variable decode_input_cond_, logic_mux_cond_;
mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
mutable condition_variable decode_input_cond_, logic_mux_cond_;