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

output/Control: move two AudioOutput methods to Finish.cxx

Browse Source
This commit is contained in:
Max Kellermann
2017-08-07 18:13:57 +02:00
parent 27d68d8fdd
commit 07d1b3780d
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/output/Control.cxx
View File

@@ -341,13 +341,6 @@ AudioOutputControl::StopThread() noexcept
thread.Join();
}
void
AudioOutput::BeginDestroy() noexcept
{
if (mixer != nullptr)
mixer_auto_close(mixer);
}
void
AudioOutputControl::BeginDestroy() noexcept
{
@@ -359,12 +352,6 @@ AudioOutputControl::BeginDestroy() noexcept
}
}
void
AudioOutput::FinishDestroy() noexcept
{
audio_output_free(this);
}
void
AudioOutputControl::FinishDestroy() noexcept
{

13
src/output/Finish.cxx
View File

@@ -40,3 +40,16 @@ audio_output_free(AudioOutput *ao) noexcept
{
ao_plugin_finish(ao);
}
void
AudioOutput::BeginDestroy() noexcept
{
if (mixer != nullptr)
mixer_auto_close(mixer);
}
void
AudioOutput::FinishDestroy() noexcept
{
audio_output_free(this);
}