output/Thread: move code to method InternalDrain()

src/output/Control.hxx

@@ -519,6 +519,13 @@ private:
 	 */
 	void InternalPause() noexcept;
 
+	/**
+	 * Runs inside the OutputThread.
+	 * Caller must lock the mutex.
+	 * Handles exceptions.
+	 */
+	void InternalDrain() noexcept;
+
 	/**
 	 * The OutputThread.
 	 */

src/output/Thread.cxx

@@ -362,6 +362,14 @@ AudioOutputControl::InternalPause() noexcept
 	skip_delay = true;
 }
 
+inline void
+AudioOutputControl::InternalDrain() noexcept
+{
+	const ScopeUnlock unlock(mutex);
+
+	output->Drain();
+}
+
 void
 AudioOutputControl::Task()
 {
@@ -421,10 +429,8 @@ AudioOutputControl::Task()
 			continue;
 
 		case Command::DRAIN:
-			if (open) {
+			if (open)
-				const ScopeUnlock unlock(mutex);
+				InternalDrain();
-				output->Drain();
-			}
 
 			CommandFinished();
 			continue;