From 9ade93983c61f90afa89aedf7119a17df3cbe1ba Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 8 Mar 2021 22:43:38 +0100 Subject: [PATCH] output/wasapi: rename method WaitDataPoped() to Wait() --- src/output/plugins/wasapi/WasapiOutputPlugin.cxx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx index dc9f27107..e08a4d985 100644 --- a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx +++ b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx @@ -198,7 +198,15 @@ public: void Play() noexcept { return SetStatus(Status::PLAY); } void Pause() noexcept { return SetStatus(Status::PAUSE); } - void WaitDataPoped() noexcept { data_poped.Wait(); } + + /** + * Wait for the thread to finish some work (e.g. until some + * buffer space becomes available). + */ + void Wait() noexcept { + data_poped.Wait(); + } + void CheckException() { if (error.occur.load()) { std::rethrow_exception(error.ptr); @@ -600,7 +608,7 @@ WasapiOutput::Play(const void *chunk, size_t size) static_cast(input.data), input.size); if (consumed_size == 0) { assert(is_started); - thread->WaitDataPoped(); + thread->Wait(); if (!not_interrupted.test_and_set()) { throw AudioOutputInterrupted{}; }