summaryrefslogtreecommitdiff
path: root/src/lib/writer.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-09-01 10:31:09 +0100
committerCarl Hetherington <cth@carlh.net>2015-09-01 10:31:09 +0100
commit4685843ba4194d8b59ed6eb1335ae27052178726 (patch)
treecbed9c6712b2dfa9d7c155751dad4b2908d21092 /src/lib/writer.cc
parentc5c005aec1393fc606db035ee71b8d831c370ab1 (diff)
Fix duplicate name of _mutex in ExceptionStore and some of its children.
Diffstat (limited to 'src/lib/writer.cc')
-rw-r--r--src/lib/writer.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 2571ce3cb..58b2b8a91 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -160,7 +160,7 @@ Writer::~Writer ()
void
Writer::write (Data encoded, int frame, Eyes eyes)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
while (_queued_full_in_memory > _maximum_frames_in_memory) {
/* The queue is too big; wait until that is sorted out */
@@ -193,7 +193,7 @@ Writer::write (Data encoded, int frame, Eyes eyes)
void
Writer::repeat (int frame, Eyes eyes)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
while (_queued_full_in_memory > _maximum_frames_in_memory) {
/* The queue is too big; wait until that is sorted out */
@@ -220,7 +220,7 @@ Writer::repeat (int frame, Eyes eyes)
void
Writer::fake_write (int frame, Eyes eyes)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
while (_queued_full_in_memory > _maximum_frames_in_memory) {
/* The queue is too big; wait until that is sorted out */
@@ -316,7 +316,7 @@ try
{
while (true)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
while (true) {
@@ -459,7 +459,7 @@ catch (...)
void
Writer::terminate_thread (bool can_throw)
{
- boost::mutex::scoped_lock lock (_mutex);
+ boost::mutex::scoped_lock lock (_state_mutex);
if (_thread == 0) {
return;
}