diff options
| author | Max Kellermann <max@duempel.org> | 2015-11-11 16:50:57 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2015-11-11 16:50:57 +0100 |
| commit | 36239895bd822d5fd3087218fbb10986430b8c9b (patch) | |
| tree | 6d0891ec5b68e2686ef8c000ad4b1d2a44157af4 /src/queue/PlaylistControl.cxx | |
| parent | 738583e3d4cd7a35aec545448f86a8c097768785 (diff) | |
| download | mpd-36239895bd822d5fd3087218fbb10986430b8c9b.tar.gz mpd-36239895bd822d5fd3087218fbb10986430b8c9b.tar.xz mpd-36239895bd822d5fd3087218fbb10986430b8c9b.zip | |
player/Control: add Lock prefix to locking method names
Diffstat (limited to '')
| -rw-r--r-- | src/queue/PlaylistControl.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/queue/PlaylistControl.cxx b/src/queue/PlaylistControl.cxx index f7f0a4225..43da2de62 100644 --- a/src/queue/PlaylistControl.cxx +++ b/src/queue/PlaylistControl.cxx @@ -38,7 +38,7 @@ playlist::Stop(PlayerControl &pc) assert(current >= 0); FormatDebug(playlist_domain, "stop"); - pc.Stop(); + pc.LockStop(); queued = -1; playing = false; @@ -59,7 +59,7 @@ playlist::Stop(PlayerControl &pc) PlaylistResult playlist::PlayPosition(PlayerControl &pc, int song) { - pc.ClearError(); + pc.LockClearError(); unsigned i = song; if (song == -1) { @@ -71,7 +71,7 @@ playlist::PlayPosition(PlayerControl &pc, int song) if (playing) { /* already playing: unpause playback, just in case it was paused, and return */ - pc.SetPause(false); + pc.LockSetPause(false); return PlaylistResult::SUCCESS; } @@ -196,7 +196,7 @@ playlist::SeekSongOrder(PlayerControl &pc, unsigned i, SongTime seek_time) const DetachedSong *queued_song = GetQueuedSong(); - pc.ClearError(); + pc.LockClearError(); stop_on_error = true; error_count = 0; @@ -210,7 +210,7 @@ playlist::SeekSongOrder(PlayerControl &pc, unsigned i, SongTime seek_time) queued_song = nullptr; } - if (!pc.Seek(new DetachedSong(queue.GetOrder(i)), seek_time)) { + if (!pc.LockSeek(new DetachedSong(queue.GetOrder(i)), seek_time)) { UpdateQueuedSong(pc, queued_song); return PlaylistResult::NOT_PLAYING; @@ -254,7 +254,7 @@ playlist::SeekCurrent(PlayerControl &pc, return PlaylistResult::NOT_PLAYING; if (relative) { - const auto status = pc.GetStatus(); + const auto status = pc.LockGetStatus(); if (status.state != PlayerState::PLAY && status.state != PlayerState::PAUSE) |