From: Joel Holdsworth <redacted>
Date: Mon, 17 Dec 2012 21:18:36 +0000 (+0000)
Subject: Renamed pv::SigSession::_state_mutex to pv::SigSession::_sampling_mutex
X-Git-Tag: pulseview-0.1.0~193
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=949f80503dff6502f9624aae8fa1ba26f2ea6b6c

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

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index b9ccc2b6..adad2c5e 100644
--- 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 42cac0f6..deb95ed8 100644
--- 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;