X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=0a28fe3c5324eba3fcaf230910a38071c06f578b;hp=dd2ad79dbb790f0553220fe34fbb211ba710ca2f;hb=5ecf957f9f58abc2372b0214333d3491477c1b4d;hpb=2749b858a7bc0bb67d550438695f2ae9c613b6c7 diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp index dd2ad79d..0a28fe3c 100644 --- a/pv/data/decodesignal.hpp +++ b/pv/data/decodesignal.hpp @@ -110,9 +110,9 @@ public: * i.e. the number of samples where samples are available * for all connected channels. */ - int64_t get_working_sample_count() const; + int64_t get_working_sample_count(uint32_t segment_id) const; - int64_t get_decoded_sample_count() const; + int64_t get_decoded_sample_count(uint32_t segment_id) const; vector visible_rows() const; @@ -152,7 +152,7 @@ private: static void annotation_callback(srd_proto_data *pdata, void *decode_signal); Q_SIGNALS: - void new_annotations(); + void new_annotations(); // TODO Supply segment for which they belong to void decode_reset(); void decode_finished(); void channels_updated(); @@ -177,6 +177,7 @@ private: double samplerate_; int64_t samples_decoded_; + uint32_t currently_processed_segment_; vector< shared_ptr > stack_; map, decode::Row> class_rows_; @@ -185,7 +186,7 @@ private: vector< map> rows_; /// Set of annotations for current segment - map *current_rows_; + map *current_rows_; // TODO Multiple segment support mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_; mutable condition_variable decode_input_cond_, logic_mux_cond_;