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

win32/WinEvent: add default value to Wait()

Browse Source
This commit is contained in:
Max Kellermann 2021-03-05 16:04:56 +01:00
parent 2011a6e2ee
commit 637cf8a039
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/output/plugins/WasapiOutputPlugin.cxx
View File

@ -155,7 +155,7 @@ public:
void Finish() noexcept { return SetStatus(Status::FINISH); } void Finish() noexcept { return SetStatus(Status::FINISH); }
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(INFINITE); } void WaitDataPoped() noexcept { data_poped.Wait(); }
void CheckException() { void CheckException() {
if (error.occur.load()) { if (error.occur.load()) {
auto err = std::exchange(error.ptr, nullptr); auto err = std::exchange(error.ptr, nullptr);
@ -269,7 +269,7 @@ void WasapiOutputThread::Work() noexcept {
COM com{true}; COM com{true};
while (true) { while (true) {
try { try {
event.Wait(INFINITE); event.Wait();
Status current_state = status.load(); Status current_state = status.load();
if (current_state == Status::FINISH) { if (current_state == Status::FINISH) {
@ -322,7 +322,7 @@ void WasapiOutputThread::Work() noexcept {
} catch (...) { } catch (...) {
error.ptr = std::current_exception(); error.ptr = std::current_exception();
error.occur.store(true); error.occur.store(true);
error.thrown.Wait(INFINITE); error.thrown.Wait();
} }
} }
} }

2
src/win32/WinEvent.hxx
View File

@ -40,7 +40,7 @@ public:
HANDLE handle() noexcept { return event; } HANDLE handle() noexcept { return event; }
DWORD Wait(DWORD milliseconds) noexcept { DWORD Wait(DWORD milliseconds=INFINITE) noexcept {
return WaitForSingleObject(event, milliseconds); return WaitForSingleObject(event, milliseconds);
} }