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

OutputThread: move code to CloseOutput()

Browse Source
This commit is contained in:
Max Kellermann
2014-10-23 23:24:01 +02:00
parent 2e98324486
commit bef8c83388
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/output/Internal.hxx
View File

@@ -382,6 +382,13 @@ private:
void Close(bool drain); void Close(bool drain);
void Reopen(); void Reopen();
/**
* Close the output plugin.
*
* Mutex must not be locked.
*/
void CloseOutput(bool drain);
AudioFormat OpenFilter(AudioFormat &format, Error &error_r); AudioFormat OpenFilter(AudioFormat &format, Error &error_r);
/** /**

18
src/output/OutputThread.cxx
View File

@@ -251,12 +251,7 @@ AudioOutput::Close(bool drain)
mutex.unlock(); mutex.unlock();
if (drain) CloseOutput(drain);
ao_plugin_drain(this);
else
ao_plugin_cancel(this);
ao_plugin_close(this);
CloseFilter(); CloseFilter();
mutex.lock(); mutex.lock();
@@ -265,6 +260,17 @@ AudioOutput::Close(bool drain)
plugin.name, name); plugin.name, name);
} }
inline void
AudioOutput::CloseOutput(bool drain)
{
if (drain)
ao_plugin_drain(this);
else
ao_plugin_cancel(this);
ao_plugin_close(this);
}
void void
AudioOutput::ReopenFilter() AudioOutput::ReopenFilter()
{ {