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

output/wasapi: move the "is_started" flag to class WasapiOutputThread

Browse Source
This commit is contained in:
Max Kellermann 2021-03-10 20:39:54 +01:00
parent 73f9824ddf
commit 77fe727e69
1 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,6 +167,16 @@ class WasapiOutputThread {
const UINT32 buffer_size_in_frames; const UINT32 buffer_size_in_frames;
const bool is_exclusive; const bool is_exclusive;
/**
* This flag is only used by the calling thread
* (i.e. #OutputThread), and specifies whether the
* WasapiOutputThread has been told to play via Play(). This
* variable is somewhat redundant because we already have
* "state", but using this variable saves some overhead for
* atomic operations.
*/
bool playing = false;
bool started = false; bool started = false;
std::atomic_bool cancel = false; std::atomic_bool cancel = false;
@ -200,12 +210,30 @@ public:
thread.Join(); thread.Join();
} }
void Play() noexcept { return SetStatus(Status::PLAY); } void Play() noexcept {
void Pause() noexcept { return SetStatus(Status::PAUSE); } playing = true;
SetStatus(Status::PLAY);
}
void Pause() noexcept {
if (!playing)
return;
playing = false;
SetStatus(Status::PAUSE);
}
std::size_t Push(ConstBuffer<void> input) noexcept { std::size_t Push(ConstBuffer<void> input) noexcept {
return spsc_buffer.push(static_cast<const BYTE *>(input.data), std::size_t consumed =
spsc_buffer.push(static_cast<const BYTE *>(input.data),
input.size); input.size);
if (!playing) {
playing = true;
Play();
}
return consumed;
} }
/** /**
@ -259,11 +287,6 @@ class WasapiOutput final : public AudioOutput {
const bool dop_setting; const bool dop_setting;
#endif #endif
/**
* Only valid if the output is open.
*/
bool is_started;
/** /**
* Only valid if the output is open. * Only valid if the output is open.
*/ */
@ -625,7 +648,6 @@ WasapiOutput::DoOpen(AudioFormat &audio_format)
thread.emplace(*client, std::move(render_client), FrameSize(), thread.emplace(*client, std::move(render_client), FrameSize(),
buffer_size_in_frames, is_exclusive); buffer_size_in_frames, is_exclusive);
is_started = false;
paused = false; paused = false;
} }
@ -678,11 +700,6 @@ WasapiOutput::Play(const void *chunk, size_t size)
do { do {
const size_t consumed_size = thread->Push({chunk, size}); const size_t consumed_size = thread->Push({chunk, size});
if (!is_started) {
is_started = true;
thread->Play();
}
if (consumed_size == 0) { if (consumed_size == 0) {
thread->Wait(); thread->Wait();
thread->CheckException(); thread->CheckException();
@ -705,10 +722,7 @@ bool
WasapiOutput::Pause() WasapiOutput::Pause()
{ {
paused = true; paused = true;
if (is_started) {
thread->Pause(); thread->Pause();
is_started = false;
}
thread->CheckException(); thread->CheckException();
return true; return true;
} }