diff options
Diffstat (limited to 'src/player')
-rw-r--r-- | src/player/Control.cxx | 20 | ||||
-rw-r--r-- | src/player/Control.hxx | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/player/Control.cxx b/src/player/Control.cxx index 75742d2cf..2e90f7eef 100644 --- a/src/player/Control.cxx +++ b/src/player/Control.cxx @@ -69,14 +69,14 @@ PlayerControl::Play(DetachedSong *song) } void -PlayerControl::Cancel() +PlayerControl::LockCancel() { LockSynchronousCommand(PlayerCommand::CANCEL); assert(next_song == nullptr); } void -PlayerControl::Stop() +PlayerControl::LockStop() { LockSynchronousCommand(PlayerCommand::CLOSE_AUDIO); assert(next_song == nullptr); @@ -85,7 +85,7 @@ PlayerControl::Stop() } void -PlayerControl::UpdateAudio() +PlayerControl::LockUpdateAudio() { LockSynchronousCommand(PlayerCommand::UPDATE_AUDIO); } @@ -111,7 +111,7 @@ PlayerControl::PauseLocked() } void -PlayerControl::Pause() +PlayerControl::LockPause() { Lock(); PauseLocked(); @@ -119,7 +119,7 @@ PlayerControl::Pause() } void -PlayerControl::SetPause(bool pause_flag) +PlayerControl::LockSetPause(bool pause_flag) { Lock(); @@ -142,7 +142,7 @@ PlayerControl::SetPause(bool pause_flag) } void -PlayerControl::SetBorderPause(bool _border_pause) +PlayerControl::LockSetBorderPause(bool _border_pause) { Lock(); border_pause = _border_pause; @@ -150,7 +150,7 @@ PlayerControl::SetBorderPause(bool _border_pause) } player_status -PlayerControl::GetStatus() +PlayerControl::LockGetStatus() { player_status status; @@ -182,7 +182,7 @@ PlayerControl::SetError(PlayerError type, Error &&_error) } void -PlayerControl::ClearError() +PlayerControl::LockClearError() { Lock(); @@ -211,7 +211,7 @@ PlayerControl::ClearTaggedSong() } void -PlayerControl::EnqueueSong(DetachedSong *song) +PlayerControl::LockEnqueueSong(DetachedSong *song) { assert(song != nullptr); @@ -221,7 +221,7 @@ PlayerControl::EnqueueSong(DetachedSong *song) } bool -PlayerControl::Seek(DetachedSong *song, SongTime t) +PlayerControl::LockSeek(DetachedSong *song, SongTime t) { assert(song != nullptr); 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); |