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

6
src/MusicPipe.cxx
View File

@@ -27,7 +27,7 @@
bool
MusicPipe::Contains(const MusicChunk *chunk) const
{
const ScopeLock protect(mutex);
const std::lock_guard<Mutex> protect(mutex);
for (const MusicChunk *i = head; i != nullptr; i = i->next)
if (i == chunk)
@@ -41,7 +41,7 @@ MusicPipe::Contains(const MusicChunk *chunk) const
MusicChunk *
MusicPipe::Shift()
{
const ScopeLock protect(mutex);
const std::lock_guard<Mutex> protect(mutex);
MusicChunk *chunk = head;
if (chunk != nullptr) {
@@ -87,7 +87,7 @@ MusicPipe::Push(MusicChunk *chunk)
assert(!chunk->IsEmpty());
assert(chunk->length == 0 || chunk->audio_format.IsValid());
const ScopeLock protect(mutex);
const std::lock_guard<Mutex> protect(mutex);
assert(size > 0 || !audio_format.IsDefined());
assert(!audio_format.IsDefined() ||