output/Internal: remove mutex code from Close()

src/output/Internal.cxx

@@ -108,8 +108,6 @@ AudioOutput::CloseFilter() noexcept
 void
 AudioOutput::Close(bool drain) noexcept
 {
-	const ScopeUnlock unlock(mutex);
-
 	CloseOutput(drain);
 	CloseFilter();
 

src/output/Internal.hxx

@@ -142,6 +142,11 @@ public:
 
 	void Disable() noexcept;
 
+	/**
+	 * Invoke OutputPlugin::close().
+	 *
+	 * Caller must not lock the mutex.
+	 */
 	void Close(bool drain) noexcept;
 
 	/**

src/output/Thread.cxx

@@ -87,7 +87,12 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
 					   output->out_audio_format);
 		} catch (const std::runtime_error &e) {
 			open = false;
+
+			{
+				const ScopeUnlock unlock(mutex);
 				output->Close(false);
+			}
+
 			std::throw_with_nested(FormatRuntimeError("Failed to convert for \"%s\" [%s]",
 								  GetName(), output->plugin.name));
 		}
@@ -194,7 +199,12 @@ AudioOutputControl::InternalClose(bool drain) noexcept
 	assert(IsOpen());
 
 	open = false;
+
+	{
+		const ScopeUnlock unlock(mutex);
 		output->Close(drain);
+	}
+
 	source.Close();
 }