summaryrefslogtreecommitdiff
path: root/src/queue/PlaylistState.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-11-11 16:50:57 +0100
committerMax Kellermann <max@duempel.org>2015-11-11 16:50:57 +0100
commit36239895bd822d5fd3087218fbb10986430b8c9b (patch)
tree6d0891ec5b68e2686ef8c000ad4b1d2a44157af4 /src/queue/PlaylistState.cxx
parent738583e3d4cd7a35aec545448f86a8c097768785 (diff)
player/Control: add Lock prefix to locking method names
Diffstat (limited to 'src/queue/PlaylistState.cxx')
-rw-r--r--src/queue/PlaylistState.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/queue/PlaylistState.cxx b/src/queue/PlaylistState.cxx
index a1939e13a..7cb1ef661 100644
--- a/src/queue/PlaylistState.cxx
+++ b/src/queue/PlaylistState.cxx
@@ -61,7 +61,7 @@ void
playlist_state_save(BufferedOutputStream &os, const struct playlist &playlist,
PlayerControl &pc)
{
- const auto player_status = pc.GetStatus();
+ const auto player_status = pc.LockGetStatus();
os.Write(PLAYLIST_STATE_FILE_STATE);
@@ -191,7 +191,7 @@ playlist_state_restore(const char *line, TextFile &file,
called here, after the audio output states were
restored, before playback begins */
if (state != PlayerState::STOP)
- pc.UpdateAudio();
+ pc.LockUpdateAudio();
if (state == PlayerState::STOP /* && config_option */)
playlist.current = current;
@@ -201,7 +201,7 @@ playlist_state_restore(const char *line, TextFile &file,
playlist.SeekSongPosition(pc, current, seek_time);
if (state == PlayerState::PAUSE)
- pc.Pause();
+ pc.LockPause();
}
return true;
@@ -211,7 +211,7 @@ unsigned
playlist_state_get_hash(const playlist &playlist,
PlayerControl &pc)
{
- const auto player_status = pc.GetStatus();
+ const auto player_status = pc.LockGetStatus();
return playlist.queue.version ^
(player_status.state != PlayerState::STOP