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

player/Control: add method LockSetOutputError()

This commit is contained in:
Max Kellermann 2016-12-14 13:01:17 +01:00
parent 7e1b53480e
commit baa2bc0c38
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/player/Control.hxx
View File

@ -369,6 +369,22 @@ public:
*/ */
void SetError(PlayerError type, std::exception_ptr &&_error); void SetError(PlayerError type, std::exception_ptr &&_error);
/**
* Set the error and set state to PlayerState::PAUSE.
*/
void SetOutputError(std::exception_ptr &&_error) {
SetError(PlayerError::OUTPUT, std::move(_error));
/* pause: the user may resume playback as soon as an
audio output becomes available */
state = PlayerState::PAUSE;
}
void LockSetOutputError(std::exception_ptr &&_error) {
const ScopeLock lock(mutex);
SetOutputError(std::move(_error));
}
/** /**
* Checks whether an error has occurred, and if so, rethrows * Checks whether an error has occurred, and if so, rethrows
* it. * it.

12
src/player/Thread.cxx
View File

@ -461,10 +461,7 @@ Player::OpenOutput()
audio output becomes available */ audio output becomes available */
paused = true; paused = true;
pc.Lock(); pc.LockSetOutputError(std::current_exception());
pc.SetError(PlayerError::OUTPUT, std::current_exception());
pc.state = PlayerState::PAUSE;
pc.Unlock();
idle_add(IDLE_PLAYER); idle_add(IDLE_PLAYER);
@ -911,16 +908,11 @@ Player::PlayNextChunk()
buffer.Return(chunk); buffer.Return(chunk);
pc.Lock();
pc.SetError(PlayerError::OUTPUT, std::current_exception());
/* pause: the user may resume playback as soon as an /* pause: the user may resume playback as soon as an
audio output becomes available */ audio output becomes available */
pc.state = PlayerState::PAUSE;
paused = true; paused = true;
pc.Unlock(); pc.LockSetOutputError(std::current_exception());
idle_add(IDLE_PLAYER); idle_add(IDLE_PLAYER);