Renamed pv::SigSession::_state_mutex to pv::SigSession::_sampling_mutex

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 8da89d09b3fd6d0cde07fea0fde589d90e779902..deb95ed8b2cb8b18bf36235fbd453e9195ade31d 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -73,17 +73,27 @@ public:
        boost::shared_ptr<LogicData> get_data();
 
 private:
+       void set_capture_state(capture_state state);
+
+private:
+       void load_thread_proc(const std::string name);
+
        void sample_thread_proc(struct sr_dev_inst *sdi,
                uint64_t record_length, uint64_t sample_rate);
 
+       void feed_in_meta_logic(const struct sr_dev_inst *sdi,
+               const sr_datafeed_meta_logic &meta_logic);
+
+       void feed_in_logic(const sr_datafeed_logic &logic);
+
        void data_feed_in(const struct sr_dev_inst *sdi,
-               struct sr_datafeed_packet *packet);
+               const struct sr_datafeed_packet *packet);
 
        static void data_feed_in_proc(const struct sr_dev_inst *sdi,
-               struct sr_datafeed_packet *packet);
+               const struct sr_datafeed_packet *packet);
 
 private:
-       mutable boost::mutex _state_mutex;
+       mutable boost::mutex _sampling_mutex;
        capture_state _capture_state;
 
        mutable boost::mutex _signals_mutex;
@@ -96,6 +106,8 @@ private:
        std::auto_ptr<boost::thread> _sampling_thread;
 
 signals:
+       void capture_state_changed(int state);
+
        void signals_changed();
 
        void data_updated();