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

output/wasapi: eliminate `friend` declaration

This commit is contained in:
Max Kellermann 2021-03-08 19:53:50 +01:00
parent 1fe0c673bc
commit 73f9824ddf
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,6 @@ SetDSDFallback(AudioFormat &audio_format) noexcept
} // namespace } // namespace
class WasapiOutputThread { class WasapiOutputThread {
friend class WasapiOutput;
Thread thread{BIND_THIS_METHOD(Work)}; Thread thread{BIND_THIS_METHOD(Work)};
WinEvent event; WinEvent event;
WinEvent data_poped; WinEvent data_poped;
@ -204,6 +203,11 @@ 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); }
std::size_t Push(ConstBuffer<void> input) noexcept {
return spsc_buffer.push(static_cast<const BYTE *>(input.data),
input.size);
}
/** /**
* Instruct the thread to discard the buffer (and wait for * Instruct the thread to discard the buffer (and wait for
* completion). This needs to be done inside this thread, * completion). This needs to be done inside this thread,
@ -672,8 +676,7 @@ WasapiOutput::Play(const void *chunk, size_t size)
return size; return size;
do { do {
const size_t consumed_size = thread->spsc_buffer.push( const size_t consumed_size = thread->Push({chunk, size});
static_cast<const BYTE *>(input.data), input.size);
if (!is_started) { if (!is_started) {
is_started = true; is_started = true;