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

output/Thread: move code to method InternalCloseError()

Browse Source
This commit is contained in:
Max Kellermann 2018-01-02 17:15:10 +01:00
parent ae7fcf4c6b
commit b93e3b2cf6
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/Control.hxx
View File

@ -466,6 +466,14 @@ private:
*/ */
void InternalClose(bool drain) noexcept; void InternalClose(bool drain) noexcept;
/**
* An error has occurred, and this output must be closed.
*/
void InternalCloseError(std::exception_ptr e) noexcept {
Failure(e);
InternalClose(false);
}
/** /**
* Runs inside the OutputThread. * Runs inside the OutputThread.
* Caller must lock the mutex. * Caller must lock the mutex.

7
src/output/Thread.cxx
View File

@ -232,8 +232,7 @@ try {
} catch (...) { } catch (...) {
FormatError(std::current_exception(), FormatError(std::current_exception(),
"Failed to filter for %s", GetLogName()); "Failed to filter for %s", GetLogName());
Failure(std::current_exception()); InternalCloseError(std::current_exception());
InternalClose(false);
return false; return false;
} }
@ -273,9 +272,7 @@ AudioOutputControl::PlayChunk() noexcept
} catch (...) { } catch (...) {
FormatError(std::current_exception(), FormatError(std::current_exception(),
"Failed to play on %s", GetLogName()); "Failed to play on %s", GetLogName());
Failure(std::current_exception()); InternalCloseError(std::current_exception());
InternalClose(false);
return false; return false;
} }