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

OutputThread: unlock mutex for CloseFilter()

Browse Source 
Be consistent.
This commit is contained in:
Max Kellermann 2014-10-24 00:28:58 +02:00
parent b07bddf742
commit 8fc3768166
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/output/Internal.hxx
View File

@ -383,7 +383,12 @@ private:
void Reopen(); void Reopen();
AudioFormat OpenFilter(AudioFormat &format, Error &error_r); AudioFormat OpenFilter(AudioFormat &format, Error &error_r);
/**
* Mutex must not be locked.
*/
void CloseFilter(); void CloseFilter();
void ReopenFilter(); void ReopenFilter();
/** /**

9
src/output/OutputThread.cxx
View File

@ -174,7 +174,10 @@ AudioOutput::Open()
FormatError(error, "Failed to open \"%s\" [%s]", FormatError(error, "Failed to open \"%s\" [%s]",
name, plugin.name); name, plugin.name);
mutex.unlock();
CloseFilter(); CloseFilter();
mutex.lock();
fail_timer.Update(); fail_timer.Update();
return; return;
} }
@ -184,7 +187,10 @@ AudioOutput::Open()
FormatError(error, "Failed to convert for \"%s\" [%s]", FormatError(error, "Failed to convert for \"%s\" [%s]",
name, plugin.name); name, plugin.name);
mutex.unlock();
CloseFilter(); CloseFilter();
mutex.lock();
fail_timer.Update(); fail_timer.Update();
return; return;
} }
@ -233,7 +239,10 @@ AudioOutput::ReopenFilter()
{ {
Error error; Error error;
mutex.unlock();
CloseFilter(); CloseFilter();
mutex.lock();
const AudioFormat filter_audio_format = const AudioFormat filter_audio_format =
OpenFilter(in_audio_format, error); OpenFilter(in_audio_format, error);
if (!filter_audio_format.IsDefined() || if (!filter_audio_format.IsDefined() ||