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

output/Thread: rename InternalClose() to InternalCheckClose()

Browse Source
This commit is contained in:
Max Kellermann 2017-08-07 16:25:58 +02:00
parent 9d6b4f46d4
commit 89a2e5ded3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/output/Control.hxx
View File

@ -425,7 +425,7 @@ private:
/** /**
* Runs inside the OutputThread. * Runs inside the OutputThread.
*/ */
void InternalClose(bool drain) noexcept; void InternalCheckClose(bool drain) noexcept;
/** /**
* Wait until the output's delay reaches zero. * Wait until the output's delay reaches zero.

10
src/output/Thread.cxx
View File

@ -121,7 +121,7 @@ AudioOutputControl::InternalDisable() noexcept
if (!really_enabled) if (!really_enabled)
return; return;
InternalClose(false); InternalCheckClose(false);
really_enabled = false; really_enabled = false;
output->Disable(); output->Disable();
@ -172,7 +172,7 @@ AudioOutputControl::InternalOpen(const AudioFormat in_audio_format,
} }
inline void inline void
AudioOutputControl::InternalClose(bool drain) noexcept AudioOutputControl::InternalCheckClose(bool drain) noexcept
{ {
if (!IsOpen()) if (!IsOpen())
return; return;
@ -211,7 +211,7 @@ try {
FormatError(e, "Failed to filter for output \"%s\" [%s]", FormatError(e, "Failed to filter for output \"%s\" [%s]",
GetName(), output->plugin.name); GetName(), output->plugin.name);
InternalClose(false); InternalCheckClose(false);
/* don't automatically reopen this device for 10 /* don't automatically reopen this device for 10
seconds */ seconds */
@ -259,7 +259,7 @@ AudioOutputControl::PlayChunk() noexcept
} }
if (nbytes == 0) { if (nbytes == 0) {
InternalClose(false); InternalCheckClose(false);
/* don't automatically reopen this device for /* don't automatically reopen this device for
10 seconds */ 10 seconds */
@ -380,7 +380,7 @@ AudioOutputControl::Task()
break; break;
case Command::CLOSE: case Command::CLOSE:
InternalClose(false); InternalCheckClose(false);
CommandFinished(); CommandFinished();
break; break;