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

output/Thread: move Enable() call to InternalEnable()

Browse Source
This commit is contained in:
Max Kellermann 2017-06-08 09:51:13 +02:00
parent 614df96382
commit a72a02f0f2
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/output/Control.hxx
View File

@ -360,6 +360,13 @@ public:
void LockAllowPlay() noexcept;
private:
/**
* Runs inside the OutputThread. Handles exceptions.
*
* @return true on success
*/
bool InternalEnable() noexcept;
/**
* Runs inside the OutputThread. Handles exceptions.
*/

34
src/output/Thread.cxx
View File

@ -197,6 +197,22 @@ AudioOutput::OpenOutputAndConvert(AudioFormat desired_audio_format)
}
}
inline bool
AudioOutputControl::InternalEnable() noexcept
{
last_error = nullptr;
try {
output->Enable();
return true;
} catch (const std::runtime_error &e) {
LogError(e);
fail_timer.Update();
last_error = std::current_exception();
return false;
}
}
inline void
AudioOutputControl::InternalDisable() noexcept
{
@ -210,14 +226,15 @@ inline void
AudioOutputControl::InternalOpen(const AudioFormat audio_format,
const MusicPipe &pipe) noexcept
{
/* enable the device (just in case the last enable has failed) */
if (!InternalEnable())
return;
last_error = nullptr;
fail_timer.Reset();
skip_delay = true;
try {
/* enable the device (just in case the last enable has failed) */
output->Enable();
output->Open(audio_format, pipe);
} catch (const std::runtime_error &e) {
LogError(e);
@ -459,16 +476,7 @@ AudioOutputControl::Task()
break;
case Command::ENABLE:
last_error = nullptr;
try {
output->Enable();
} catch (const std::runtime_error &e) {
LogError(e);
fail_timer.Update();
last_error = std::current_exception();
}
InternalEnable();
CommandFinished();
break;