aboutsummaryrefslogtreecommitdiffstats
path: root/src/player/Control.hxx
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/player/Control.hxx
parent738583e3d4cd7a35aec545448f86a8c097768785 (diff)
downloadmpd-36239895bd822d5fd3087218fbb10986430b8c9b.tar.gz
mpd-36239895bd822d5fd3087218fbb10986430b8c9b.tar.xz
mpd-36239895bd822d5fd3087218fbb10986430b8c9b.zip
player/Control: add Lock prefix to locking method names
Diffstat (limited to 'src/player/Control.hxx')
-rw-r--r--src/player/Control.hxx20
1 files changed, 10 insertions, 10 deletions
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);