oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge tag 'v0.20.7'

Browse Source 
release v0.20.7
This commit is contained in:
Max Kellermann
2017-05-15 23:01:49 +02:00
parent 89b900432e b4c9d9c2a7
commit 4faef28cc5
289 changed files with 914 additions and 924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/player/Control.hxx
View File

@@ -317,7 +317,7 @@ private:
* To be called from the main thread. Caller must lock the
* object.
*/
void SynchronousCommand(PlayerCommand cmd) {
void SynchronousCommand(PlayerCommand cmd) noexcept {
assert(command == PlayerCommand::NONE);
command = cmd;
@@ -332,7 +332,7 @@ private:
* To be called from the main thread. This method locks the
* object.
*/
void LockSynchronousCommand(PlayerCommand cmd) {
void LockSynchronousCommand(PlayerCommand cmd) noexcept {
const std::lock_guard<Mutex> protect(mutex);
SynchronousCommand(cmd);
}
@@ -383,7 +383,7 @@ public:
void Kill();
gcc_pure
player_status LockGetStatus();
player_status LockGetStatus() noexcept;
PlayerState GetState() const {
return state;