Fix comment

[pulseview.git] / pv / data / decodesignal.hpp

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 04497ec52ff766ee7acd49bf1b6ff21bf5277275..4a1e7f005c671a3bf553a42c407b0eee4fc327a2 100644 (file)
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -99,7 +99,7 @@ public:
        void remove_decoder(int index);
        bool toggle_decoder_visibility(int index);
 
-       void reset_decode();
+       void reset_decode(bool shutting_down = false);
        void begin_decode();
        QString error_message() const;
 
@@ -125,7 +125,9 @@ public:
        vector<decode::Row> visible_rows() const;
 
        /**
-        * Extracts sorted annotations between two period into a vector.
+        * Extracts annotations between the given sample range into a vector.
+        * Note: The annotations are unsorted and only annotations that fully
+        * fit into the sample range are considered.
         */
        void get_annotation_subset(
                vector<pv::data::decode::Annotation> &dest,
@@ -137,6 +139,8 @@ public:
        virtual void restore_settings(QSettings &settings);
 
 private:
+       void set_error_message(QString msg);
+
        uint32_t get_input_segment_count() const;
 
        uint32_t get_input_samplerate(uint32_t segment_id) const;
@@ -149,19 +153,18 @@ private:
 
        void logic_mux_proc();
 
-       void query_input_metadata();
-
        void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
                const shared_ptr<LogicSegment> input_segment);
 
        void decode_proc();
 
        void start_srd_session();
+       void terminate_srd_session();
        void stop_srd_session();
 
        void connect_input_notifiers();
 
-       void create_segments();
+       void create_decode_segment();
 
        static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 
@@ -188,6 +191,7 @@ private:
        bool logic_mux_data_invalid_;
 
        vector< shared_ptr<decode::Decoder> > stack_;
+       bool stack_config_changed_;
        map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
        vector<DecodeSegment> segments_;