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/mixer/MixerControl.cxx
View File

@@ -53,7 +53,7 @@ mixer_open(Mixer *mixer)
{
assert(mixer != nullptr);
const ScopeLock protect(mixer->mutex);
const std::lock_guard<Mutex> protect(mixer->mutex);
if (mixer->open)
return;
@@ -83,7 +83,7 @@ mixer_close(Mixer *mixer)
{
assert(mixer != nullptr);
const ScopeLock protect(mixer->mutex);
const std::lock_guard<Mutex> protect(mixer->mutex);
if (mixer->open)
mixer_close_internal(mixer);
@@ -120,7 +120,7 @@ mixer_get_volume(Mixer *mixer)
if (mixer->plugin.global && !mixer->failed)
mixer_open(mixer);
const ScopeLock protect(mixer->mutex);
const std::lock_guard<Mutex> protect(mixer->mutex);
if (mixer->open) {
try {
@@ -144,7 +144,7 @@ mixer_set_volume(Mixer *mixer, unsigned volume)
if (mixer->plugin.global && !mixer->failed)
mixer_open(mixer);
const ScopeLock protect(mixer->mutex);
const std::lock_guard<Mutex> protect(mixer->mutex);
if (mixer->open)
mixer->SetVolume(volume);