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

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index b9ccc2b613d9d06f84a4ebab7caa2aa2eb8d0ab0..adad2c5ee0cc51304f928e92445471d7ef88c2d8 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -64,7 +64,7 @@ void SigSession::load_file(const string &name)
 
 SigSession::capture_state SigSession::get_capture_state() const
 {
-       lock_guard<mutex> lock(_state_mutex);
+       lock_guard<mutex> lock(_sampling_mutex);
        return _capture_state;
 }
 
@@ -105,7 +105,7 @@ boost::shared_ptr<LogicData> SigSession::get_data()
 
 void SigSession::set_capture_state(capture_state state)
 {
-       lock_guard<mutex> lock(_state_mutex);
+       lock_guard<mutex> lock(_sampling_mutex);
        _capture_state = state;
        capture_state_changed(state);
 }

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 42cac0f61e1472fb056aef816b34399b2585932e..deb95ed8b2cb8b18bf36235fbd453e9195ade31d 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -93,7 +93,7 @@ private:
                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;