X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=29e8441a83785ee62628959d4676791f90456b27;hp=0a28fe3c5324eba3fcaf230910a38071c06f578b;hb=f2f4845f15f5b5aa60cceb47c349201f44e1d14b;hpb=5ecf957f9f58abc2372b0214333d3491477c1b4d diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp index 0a28fe3..29e8441 100644 --- a/pv/data/decodesignal.hpp +++ b/pv/data/decodesignal.hpp @@ -148,7 +148,7 @@ private: 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: @@ -183,10 +183,10 @@ private: map, decode::Row> class_rows_; /// Annotations for all segments - vector< map> rows_; + vector< map> segmented_rows_; /// Set of annotations for current segment - map *current_rows_; // TODO Multiple segment support + map *current_rows_; mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_; mutable condition_variable decode_input_cond_, logic_mux_cond_;