oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

thread/Mutex: remove ScopeLock, use std::lock_guard directly

Browse Source
This commit is contained in:
Max Kellermann
2017-01-03 07:11:57 +01:00
parent a42021655c
commit 2e182e84c3
51 changed files with 158 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/plugins/sles/SlesOutputPlugin.cxx
View File

@@ -319,7 +319,7 @@ SlesOutput::Play(const void *chunk, size_t size)
pause = false;
}
const ScopeLock protect(mutex);
const std::lock_guard<Mutex> protect(mutex);
assert(filled < BUFFER_SIZE);
@@ -348,7 +348,7 @@ SlesOutput::Play(const void *chunk, size_t size)
inline void
SlesOutput::Drain()
{
const ScopeLock protect(mutex);
const std::lock_guard<Mutex> protect(mutex);
assert(filled < BUFFER_SIZE);
@@ -371,7 +371,7 @@ SlesOutput::Cancel()
FormatWarning(sles_domain,
"AndroidSimpleBufferQueue.Clear() failed");
const ScopeLock protect(mutex);
const std::lock_guard<Mutex> protect(mutex);
n_queued = 0;
filled = 0;
}
@@ -398,7 +398,7 @@ SlesOutput::Pause()
inline void
SlesOutput::PlayedCallback()
{
const ScopeLock protect(mutex);
const std::lock_guard<Mutex> protect(mutex);
assert(n_queued > 0);
--n_queued;
cond.signal();