Commit 612def5c authored by Max Kellermann's avatar Max Kellermann

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

parent 704825be
...@@ -99,7 +99,7 @@ AudioOutput::CloseOutput(bool drain) noexcept ...@@ -99,7 +99,7 @@ AudioOutput::CloseOutput(bool drain) noexcept
} }
void void
AudioOutput::CloseFilter() noexcept AudioOutput::CloseSoftwareMixer() noexcept
{ {
if (mixer != nullptr && mixer->IsPlugin(software_mixer_plugin)) if (mixer != nullptr && mixer->IsPlugin(software_mixer_plugin))
software_mixer_set_filter(*mixer, nullptr); software_mixer_set_filter(*mixer, nullptr);
...@@ -109,7 +109,7 @@ void ...@@ -109,7 +109,7 @@ void
AudioOutput::Close(bool drain) noexcept AudioOutput::Close(bool drain) noexcept
{ {
CloseOutput(drain); CloseOutput(drain);
CloseFilter(); CloseSoftwareMixer();
FormatDebug(output_domain, "closed plugin=%s name=\"%s\"", FormatDebug(output_domain, "closed plugin=%s name=\"%s\"",
plugin.name, name); plugin.name, name);
......
...@@ -163,7 +163,7 @@ public: ...@@ -163,7 +163,7 @@ public:
/** /**
* Mutex must not be locked. * Mutex must not be locked.
*/ */
void CloseFilter() noexcept; void CloseSoftwareMixer() noexcept;
void BeginPause() noexcept; void BeginPause() noexcept;
bool IteratePause() noexcept; bool IteratePause() noexcept;
......
...@@ -73,7 +73,7 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format) ...@@ -73,7 +73,7 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
output->OpenOutputAndConvert(output->filter_audio_format); output->OpenOutputAndConvert(output->filter_audio_format);
} catch (...) { } catch (...) {
const ScopeUnlock unlock(mutex); const ScopeUnlock unlock(mutex);
output->CloseFilter(); output->CloseSoftwareMixer();
throw; throw;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment