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

output/wasapi: move Start()/Stop() calls to WasapiOutputThread::Work()

Browse Source
This commit is contained in:
Max Kellermann 2021-03-08 22:08:03 +01:00
parent d72263d28d
commit 69783a44c8
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,6 +168,8 @@ class WasapiOutputThread {
const UINT32 buffer_size_in_frames; const UINT32 buffer_size_in_frames;
const bool is_exclusive; const bool is_exclusive;
bool started = false;
enum class Status : uint32_t { FINISH, PLAY, PAUSE }; enum class Status : uint32_t { FINISH, PLAY, PAUSE };
alignas(BOOST_LOCKFREE_CACHELINE_BYTES) std::atomic<Status> status = alignas(BOOST_LOCKFREE_CACHELINE_BYTES) std::atomic<Status> status =
Status::PAUSE; Status::PAUSE;
@ -332,6 +334,17 @@ try {
SetThreadName("Wasapi Output Worker"); SetThreadName("Wasapi Output Worker");
FormatDebug(wasapi_output_domain, "Working thread started"); FormatDebug(wasapi_output_domain, "Working thread started");
COM com; COM com;
AtScopeExit(this) {
if (started) {
try {
Stop(client);
} catch (...) {
LogError(std::current_exception());
}
}
};
while (true) { while (true) {
event.Wait(); event.Wait();
@ -342,11 +355,21 @@ try {
return; return;
} }
if (!started) {
if (current_state != Status::PLAY)
/* don't bother starting the
IAudioClient if we're
paused */
continue;
Start(client);
started = true;
}
UINT32 write_in_frames = buffer_size_in_frames; UINT32 write_in_frames = buffer_size_in_frames;
if (!is_exclusive) { if (!is_exclusive) {
UINT32 data_in_frames = UINT32 data_in_frames =
GetCurrentPaddingFrames(client); GetCurrentPaddingFrames(client);
if (data_in_frames >= buffer_size_in_frames) { if (data_in_frames >= buffer_size_in_frames) {
continue; continue;
} }
@ -557,9 +580,6 @@ WasapiOutput::Close() noexcept
assert(thread); assert(thread);
try { try {
com_worker->Async([&]() {
Stop(*client);
}).get();
thread->CheckException(); thread->CheckException();
} catch (...) { } catch (...) {
FormatError(std::current_exception(), FormatError(std::current_exception(),
@ -623,9 +643,6 @@ WasapiOutput::Play(const void *chunk, size_t size)
if (!is_started) { if (!is_started) {
is_started = true; is_started = true;
thread->Play(); thread->Play();
com_worker->Async([&]() {
Start(*client);
}).wait();
} }
thread->CheckException(); thread->CheckException();