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

output/winmm: use std::array

Browse Source
This commit is contained in:
Max Kellermann 2016-11-07 08:50:58 +01:00
parent 0c5b986fc4
commit 54d5184255
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/plugins/WinmmOutputPlugin.cxx
View File

@ -28,6 +28,8 @@
#include "util/Macros.hxx" #include "util/Macros.hxx"
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
#include <array>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -51,7 +53,7 @@ class WinmmOutput {
*/ */
HANDLE event; HANDLE event;
WinmmBuffer buffers[8]; std::array<WinmmBuffer, 8> buffers;
unsigned next_buffer; unsigned next_buffer;
public: public:
@ -275,7 +277,7 @@ WinmmOutput::Play(const void *chunk, size_t size, Error &)
} }
/* mark our buffer as "used" */ /* mark our buffer as "used" */
next_buffer = (next_buffer + 1) % ARRAY_SIZE(buffers); next_buffer = (next_buffer + 1) % buffers.size();
return size; return size;
} }
@ -283,7 +285,7 @@ WinmmOutput::Play(const void *chunk, size_t size, Error &)
void void
WinmmOutput::DrainAllBuffers() WinmmOutput::DrainAllBuffers()
{ {
for (unsigned i = next_buffer; i < ARRAY_SIZE(buffers); ++i) for (unsigned i = next_buffer; i < buffers.size(); ++i)
DrainBuffer(buffers[i]); DrainBuffer(buffers[i]);
for (unsigned i = 0; i < next_buffer; ++i) for (unsigned i = 0; i < next_buffer; ++i)