output/wasapi: check for exceptions after Wait()

This finishes problems which occur early in the WasapiOutputThread; previously, the error was ignored and the output blocked forever without doing anything (and without reporting the error).

output/wasapi: check for exceptions after Wait()
3a948515 · Max Kellermann · 9ade9398 · 3a948515
Commit 3a948515 authored Mar 08, 2021 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

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

No files found.
--- a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
+++ b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
@@ -382,6 +382,10 @@ try {
 } catch (...) {
 	error.ptr = std::current_exception();
 	error.occur.store(true);
+
+	/* wake up the client thread which may be inside
+	   WaitDataPoped() */
+	data_poped.Set();
 }

 AudioOutput *
@@ -609,6 +613,7 @@ WasapiOutput::Play(const void *chunk, size_t size)
 		if (consumed_size == 0) {
 			assert(is_started);
 			thread->Wait();
+			thread->CheckException();
 			if (!not_interrupted.test_and_set()) {
 				throw AudioOutputInterrupted{};
 			}