output/wasapi: move catch block to the Work() function level

If an exception has been caught, the method cannot continue playback, therefore it doesn't make sense to have the "catch" block inside the "while" block (and not break the loop after catching an exception).

output/wasapi: move catch block to the Work() function level
9256190a · Max Kellermann · 3a0dbb0a · 9256190a
Commit 9256190a authored Mar 08, 2021 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

WasapiOutputPlugin.cxx src/output/plugins/wasapi/WasapiOutputPlugin.cxx +3 -5

No files found.
--- a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
+++ b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
@@ -317,12 +317,11 @@ wasapi_output_get_client(WasapiOutput &output) noexcept

 inline void
 WasapiOutputThread::Work() noexcept
-{
+try {
 	SetThreadName("Wasapi Output Worker");
 	FormatDebug(wasapi_output_domain, "Working thread started");
 	COM com;
 	while (true) {
-		try {
 		event.Wait();

 		Status current_state = status.load();
@@ -368,12 +367,11 @@ WasapiOutputThread::Work() noexcept
 			FormatDebug(wasapi_output_domain,
 				    "Working thread paused");
 		}
-		} catch (...) {
+	}
+} catch (...) {
 	error.ptr = std::current_exception();
 	error.occur.store(true);
 	error.thrown.Wait();
-		}
-	}
 }

 AudioOutput *