summaryrefslogtreecommitdiff
path: root/src/output
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2018-11-11 07:34:08 +0100
committerMax Kellermann <max@musicpd.org>2018-11-11 12:37:25 +0100
commit12308a0f551b7928da02c3d7bd0681fa9e4243e7 (patch)
tree647bc69f0078e15a8dbd83e25ef939df42179695 /src/output
parenta958abde2f8150877873a274b573baa3685d6a21 (diff)
lib/alsa/NonBlock: move the functions into a class managing the state
Diffstat (limited to 'src/output')
-rw-r--r--src/output/plugins/AlsaOutputPlugin.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/output/plugins/AlsaOutputPlugin.cxx b/src/output/plugins/AlsaOutputPlugin.cxx
index 5c6f599cd..02b3dfe86 100644
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -148,10 +148,7 @@ class AlsaOutput final
*/
uint8_t *silence;
- /**
- * For PrepareAlsaPcmSockets().
- */
- ReusableArray<pollfd> pfd_buffer;
+ AlsaNonBlockPcm non_block;
/**
* For copying data from OutputThread to IOThread.
@@ -881,7 +878,7 @@ AlsaOutput::PrepareSockets() noexcept
}
try {
- return PrepareAlsaPcmSockets(*this, pcm, pfd_buffer);
+ return non_block.PrepareSockets(*this, pcm);
} catch (...) {
ClearSocketList();
LockCaughtError();