DecodeSignal: Auto-assign only the channels of newly added decoders

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

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 86b1931834e29211b83d427814315071144f494e..3d90f7f7de648e861d117fc24e8b1200b44fe952 100644 (file)
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -87,7 +87,7 @@ public:
        bool is_decode_signal() const;
        const vector< shared_ptr<data::decode::Decoder> >& decoder_stack() const;
 
-       void stack_decoder(srd_decoder *decoder);
+       void stack_decoder(const srd_decoder *decoder);
        void remove_decoder(int index);
        bool toggle_decoder_visibility(int index);
 
@@ -96,7 +96,7 @@ public:
        QString error_message() const;
 
        const vector<data::DecodeChannel> get_channels() const;
-       void auto_assign_signals();
+       void auto_assign_signals(const shared_ptr<pv::data::decode::Decoder> dec);
        void assign_signal(const uint16_t channel_id, const SignalBase *signal);
        int get_assigned_signal_count() const;
 
@@ -180,14 +180,6 @@ private:
        map<const decode::Row, decode::RowData> rows_;
        map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
-       /**
-        * This mutex prevents more than one thread from accessing
-        * libsigrokdecode concurrently.
-        * @todo A proper solution should be implemented to allow multiple
-        * decode operations in parallel.
-        */
-       static mutex global_srd_mutex_;
-
        mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
        mutable condition_variable decode_input_cond_, logic_mux_cond_;
        bool frame_complete_;