oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/wasapi: rename method WaitDataPoped() to Wait()

Browse Source
This commit is contained in:
Max Kellermann
2021-03-08 22:43:38 +01:00
parent 6931ce9558
commit 9ade93983c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/output/plugins/wasapi/WasapiOutputPlugin.cxx
View File

@@ -198,7 +198,15 @@ public:
void Play() noexcept { return SetStatus(Status::PLAY); } void Play() noexcept { return SetStatus(Status::PLAY); }
void Pause() noexcept { return SetStatus(Status::PAUSE); } 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() { void CheckException() {
if (error.occur.load()) { if (error.occur.load()) {
std::rethrow_exception(error.ptr); std::rethrow_exception(error.ptr);
@@ -600,7 +608,7 @@ WasapiOutput::Play(const void *chunk, size_t size)
static_cast<const BYTE *>(input.data), input.size); static_cast<const BYTE *>(input.data), input.size);
if (consumed_size == 0) { if (consumed_size == 0) {
assert(is_started); assert(is_started);
thread->WaitDataPoped(); thread->Wait();
if (!not_interrupted.test_and_set()) { if (!not_interrupted.test_and_set()) {
throw AudioOutputInterrupted{}; throw AudioOutputInterrupted{};
} }