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 3187c850216dc1a4331bcca40d0b2ab504a01331..29e8441a83785ee62628959d4676791f90456b27 100644 (file)
--- 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<decode::Row> visible_rows() const;
 
@@ -148,11 +148,12 @@ 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:
-       void new_annotations();
+       void new_annotations(); // TODO Supply segment for which they belong to
+       void decode_reset();
        void decode_finished();
        void channels_updated();
 
@@ -176,12 +177,13 @@ private:
        double samplerate_;
 
        int64_t samples_decoded_;
+       uint32_t currently_processed_segment_;
 
        vector< shared_ptr<decode::Decoder> > stack_;
        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
        map<const decode::Row, decode::RowData> *current_rows_;