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

output/Internal: rename CloseFilter() to CloseSoftwareMixer()

This commit is contained in:
Max Kellermann 2017-08-07 18:32:43 +02:00
parent 704825be96
commit 612def5c11
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/output/Internal.cxx
View File

@ -99,7 +99,7 @@ AudioOutput::CloseOutput(bool drain) noexcept
}
void
AudioOutput::CloseFilter() noexcept
AudioOutput::CloseSoftwareMixer() noexcept
{
if (mixer != nullptr && mixer->IsPlugin(software_mixer_plugin))
software_mixer_set_filter(*mixer, nullptr);
@ -109,7 +109,7 @@ void
AudioOutput::Close(bool drain) noexcept
{
CloseOutput(drain);
CloseFilter();
CloseSoftwareMixer();
FormatDebug(output_domain, "closed plugin=%s name=\"%s\"",
plugin.name, name);

2
src/output/Internal.hxx
View File

@ -163,7 +163,7 @@ public:
/**
* Mutex must not be locked.
*/
void CloseFilter() noexcept;
void CloseSoftwareMixer() noexcept;
void BeginPause() noexcept;
bool IteratePause() noexcept;

2
src/output/Thread.cxx
View File

@ -73,7 +73,7 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
output->OpenOutputAndConvert(output->filter_audio_format);
} catch (...) {
const ScopeUnlock unlock(mutex);
output->CloseFilter();
output->CloseSoftwareMixer();
throw;
}