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

player/Thread: move player_command_finished() to PlayerControl

Browse Source
This commit is contained in:
Max Kellermann 2015-11-05 00:38:09 +01:00
parent e6b37703da
commit 3a387643b3
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/player/Control.hxx
View File

@ -263,6 +263,12 @@ struct PlayerControl {
ClientSignal(); ClientSignal();
} }
void LockCommandFinished() {
Lock();
CommandFinished();
Unlock();
}
private: private:
/** /**
* Wait for the command to be finished by the player thread. * Wait for the command to be finished by the player thread.

16
src/player/Thread.cxx
View File

@ -310,14 +310,6 @@ public:
void Run(); void Run();
}; };
static void
player_command_finished(PlayerControl &pc)
{
pc.Lock();
pc.CommandFinished();
pc.Unlock();
}
void void
Player::StartDecoder(MusicPipe &_pipe) Player::StartDecoder(MusicPipe &_pipe)
{ {
@ -581,7 +573,7 @@ Player::SeekDecoder()
while (decoder_starting) { while (decoder_starting) {
if (!CheckDecoderStartup()) { if (!CheckDecoderStartup()) {
/* decoder failure */ /* decoder failure */
player_command_finished(pc); pc.LockCommandFinished();
return false; return false;
} }
} }
@ -597,13 +589,13 @@ Player::SeekDecoder()
if (!dc.Seek(where + start_time)) { if (!dc.Seek(where + start_time)) {
/* decoder failure */ /* decoder failure */
player_command_finished(pc); pc.LockCommandFinished();
return false; return false;
} }
elapsed_time = where; elapsed_time = where;
player_command_finished(pc); pc.LockCommandFinished();
assert(xfade_state == CrossFadeState::UNKNOWN); assert(xfade_state == CrossFadeState::UNKNOWN);
@ -1190,7 +1182,7 @@ player_task(void *arg)
pc.outputs.Close(); pc.outputs.Close();
player_command_finished(pc); pc.LockCommandFinished();
return; return;
case PlayerCommand::CANCEL: case PlayerCommand::CANCEL: