Apply option changes immediately, not on decode stack rebuild

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

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 0a28fe3c5324eba3fcaf230910a38071c06f578b..2d41e5003e57c391d492e80430b380cb22df2fc7 100644 (file)
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -71,6 +71,14 @@ struct DecodeChannel
        const srd_channel *pdch_;
 };
 
+struct DecodeSegment
+{
+       map<const decode::Row, decode::RowData> annotation_rows;
+       pv::util::Timestamp start_time;
+       double samplerate;
+       int64_t samples_decoded;
+};
+
 class DecodeSignal : public SignalBase
 {
        Q_OBJECT
@@ -91,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;
 
@@ -103,7 +111,7 @@ public:
        void set_initial_pin_state(const uint16_t channel_id, const int init_state);
 
        double samplerate() const;
-       const pv::util::Timestamp& start_time() const;
+       const pv::util::Timestamp start_time() const;
 
        /**
         * Returns the number of samples that can be worked on,
@@ -121,7 +129,7 @@ public:
         */
        void get_annotation_subset(
                vector<pv::data::decode::Annotation> &dest,
-               const decode::Row &row, uint64_t start_sample,
+               const decode::Row &row, uint32_t segment_id, uint64_t start_sample,
                uint64_t end_sample) const;
 
        virtual void save_settings(QSettings &settings) const;
@@ -129,26 +137,33 @@ 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;
+
        void update_channel_list();
 
        void commit_decoder_channels();
 
-       void mux_logic_samples(const int64_t start, const int64_t end);
+       void mux_logic_samples(uint32_t segment_id, const int64_t start, const int64_t end);
 
        void logic_mux_proc();
 
-       void query_input_metadata();
-
-       void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count);
+       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 prepare_annotation_segment();
+       void create_decode_segment();
+
        static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 
 Q_SIGNALS:
@@ -170,27 +185,18 @@ private:
        struct srd_session *srd_session_;
 
        shared_ptr<Logic> logic_mux_data_;
-       shared_ptr<LogicSegment> logic_mux_segment_;
+       uint32_t logic_mux_unit_size_;
        bool logic_mux_data_invalid_;
 
-       pv::util::Timestamp start_time_;
-       double samplerate_;
-
-       int64_t samples_decoded_;
-       uint32_t currently_processed_segment_;
-
        vector< shared_ptr<decode::Decoder> > stack_;
+       bool stack_config_changed_;
        map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
-       /// Annotations for all segments
-       vector< map<const decode::Row, decode::RowData>> rows_;
-
-       /// Set of annotations for current segment
-       map<const decode::Row, decode::RowData> *current_rows_; // TODO Multiple segment support
+       vector<DecodeSegment> segments_;
+       uint32_t current_segment_id_;
 
        mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
        mutable condition_variable decode_input_cond_, logic_mux_cond_;
-       bool frame_complete_;
 
        std::thread decode_thread_, logic_mux_thread_;
        atomic<bool> decode_interrupt_, logic_mux_interrupt_;