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

output/wasapi: convert pointer to reference

Browse Source
This commit is contained in:
Max Kellermann
2021-03-08 19:55:49 +01:00
parent 980ef82216
commit 22c329cdb4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,7 @@ class WasapiOutputThread : public Thread {
friend class WasapiOutput; friend class WasapiOutput;
WinEvent event; WinEvent event;
WinEvent data_poped; WinEvent data_poped;
IAudioClient *client; IAudioClient &client;
ComPtr<IAudioRenderClient> render_client; ComPtr<IAudioRenderClient> render_client;
const UINT32 frame_size; const UINT32 frame_size;
const UINT32 buffer_size_in_frames; const UINT32 buffer_size_in_frames;
@@ -178,7 +178,7 @@ class WasapiOutputThread : public Thread {
boost::lockfree::spsc_queue<BYTE> spsc_buffer; boost::lockfree::spsc_queue<BYTE> spsc_buffer;
public: public:
WasapiOutputThread(IAudioClient *_client, WasapiOutputThread(IAudioClient &_client,
ComPtr<IAudioRenderClient> &&_render_client, ComPtr<IAudioRenderClient> &&_render_client,
const UINT32 _frame_size, const UINT32 _buffer_size_in_frames, const UINT32 _frame_size, const UINT32 _buffer_size_in_frames,
bool _is_exclusive) bool _is_exclusive)
@@ -187,7 +187,7 @@ public:
buffer_size_in_frames(_buffer_size_in_frames), is_exclusive(_is_exclusive), buffer_size_in_frames(_buffer_size_in_frames), is_exclusive(_is_exclusive),
spsc_buffer(_buffer_size_in_frames * 4 * _frame_size) spsc_buffer(_buffer_size_in_frames * 4 * _frame_size)
{ {
SetEventHandle(*client, event.handle()); SetEventHandle(client, event.handle());
} }
void Finish() noexcept { return SetStatus(Status::FINISH); } void Finish() noexcept { return SetStatus(Status::FINISH); }
@@ -334,7 +334,7 @@ WasapiOutputThread::Work() noexcept
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;
@@ -543,7 +543,7 @@ WasapiOutput::DoOpen(AudioFormat &audio_format)
const UINT32 buffer_size_in_frames = GetBufferSizeInFrames(*client); const UINT32 buffer_size_in_frames = GetBufferSizeInFrames(*client);
watermark = buffer_size_in_frames * 3 * FrameSize(); watermark = buffer_size_in_frames * 3 * FrameSize();
thread.emplace(client.get(), 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);
thread->Start(); thread->Start();