aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/output/Internal.hxx5
-rw-r--r--src/output/OutputThread.cxx9
2 files changed, 14 insertions, 0 deletions
diff --git a/src/output/Internal.hxx b/src/output/Internal.hxx
index 658ebd4e1..6e6ffb442 100644
--- a/src/output/Internal.hxx
+++ b/src/output/Internal.hxx
@@ -383,7 +383,12 @@ private:
void Reopen();
AudioFormat OpenFilter(AudioFormat &format, Error &error_r);
+
+ /**
+ * Mutex must not be locked.
+ */
void CloseFilter();
+
void ReopenFilter();
/**
diff --git a/src/output/OutputThread.cxx b/src/output/OutputThread.cxx
index e46425097..d26b2da67 100644
--- a/src/output/OutputThread.cxx
+++ b/src/output/OutputThread.cxx
@@ -174,7 +174,10 @@ AudioOutput::Open()
FormatError(error, "Failed to open \"%s\" [%s]",
name, plugin.name);
+ mutex.unlock();
CloseFilter();
+ mutex.lock();
+
fail_timer.Update();
return;
}
@@ -184,7 +187,10 @@ AudioOutput::Open()
FormatError(error, "Failed to convert for \"%s\" [%s]",
name, plugin.name);
+ mutex.unlock();
CloseFilter();
+ mutex.lock();
+
fail_timer.Update();
return;
}
@@ -233,7 +239,10 @@ AudioOutput::ReopenFilter()
{
Error error;
+ mutex.unlock();
CloseFilter();
+ mutex.lock();
+
const AudioFormat filter_audio_format =
OpenFilter(in_audio_format, error);
if (!filter_audio_format.IsDefined() ||