From 36239895bd822d5fd3087218fbb10986430b8c9b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 11 Nov 2015 16:50:57 +0100 Subject: player/Control: add Lock prefix to locking method names --- src/player/Control.hxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/player/Control.hxx') diff --git a/src/player/Control.hxx b/src/player/Control.hxx index ae4465ca6..021f6ddd9 100644 --- a/src/player/Control.hxx +++ b/src/player/Control.hxx @@ -319,25 +319,25 @@ public: /** * see PlayerCommand::CANCEL */ - void Cancel(); + void LockCancel(); - void SetPause(bool pause_flag); + void LockSetPause(bool pause_flag); private: void PauseLocked(); public: - void Pause(); + void LockPause(); /** * Set the player's #border_pause flag. */ - void SetBorderPause(bool border_pause); + void LockSetBorderPause(bool border_pause); void Kill(); gcc_pure - player_status GetStatus(); + player_status LockGetStatus(); PlayerState GetState() const { return state; @@ -378,7 +378,7 @@ public: return result; } - void ClearError(); + void LockClearError(); PlayerError GetErrorType() const { return error_type; @@ -413,9 +413,9 @@ public: return result; } - void Stop(); + void LockStop(); - void UpdateAudio(); + void LockUpdateAudio(); private: void EnqueueSongLocked(DetachedSong *song) { @@ -432,7 +432,7 @@ public: * @param song the song to be queued; the given instance will be owned * and freed by the player */ - void EnqueueSong(DetachedSong *song); + void LockEnqueueSong(DetachedSong *song); /** * Makes the player thread seek the specified song to a position. @@ -442,7 +442,7 @@ public: * @return true on success, false on failure (e.g. if MPD isn't * playing currently) */ - bool Seek(DetachedSong *song, SongTime t); + bool LockSeek(DetachedSong *song, SongTime t); void SetCrossFade(float cross_fade_seconds); -- cgit v1.2.3