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

output/Filtered: move try/catch from IteratePause() to caller

This commit is contained in:
Max Kellermann 2020-10-01 20:35:21 +02:00
parent 4ca2c33181
commit c0775d328c
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/Filtered.cxx
View File

@ -196,13 +196,7 @@ FilteredAudioOutput::BeginPause() noexcept
} }
bool bool
FilteredAudioOutput::IteratePause() noexcept FilteredAudioOutput::IteratePause()
{ {
try {
return output->Pause(); return output->Pause();
} catch (...) {
FormatError(std::current_exception(), "Failed to pause %s",
GetLogName());
return false;
}
} }

2
src/output/Filtered.hxx
View File

@ -227,7 +227,7 @@ public:
void Cancel() noexcept; void Cancel() noexcept;
void BeginPause() noexcept; void BeginPause() noexcept;
bool IteratePause() noexcept; bool IteratePause();
void EndPause() noexcept{ void EndPause() noexcept{
} }

8
src/output/Thread.cxx
View File

@ -338,10 +338,14 @@ AudioOutputControl::InternalPause(std::unique_lock<Mutex> &lock) noexcept
if (!WaitForDelay(lock)) if (!WaitForDelay(lock))
break; break;
bool success; bool success = false;
{ try {
const ScopeUnlock unlock(mutex); const ScopeUnlock unlock(mutex);
success = output->IteratePause(); success = output->IteratePause();
} catch (...) {
FormatError(std::current_exception(),
"Failed to pause %s",
GetLogName());
} }
if (!success) { if (!success) {