summaryrefslogtreecommitdiff
path: root/src/mixer
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/mixer
parenta958abde2f8150877873a274b573baa3685d6a21 (diff)
lib/alsa/NonBlock: move the functions into a class managing the state
Diffstat (limited to 'src/mixer')
-rw-r--r--src/mixer/plugins/AlsaMixerPlugin.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mixer/plugins/AlsaMixerPlugin.cxx b/src/mixer/plugins/AlsaMixerPlugin.cxx
index 7dd8ab853..dbc74d941 100644
--- a/src/mixer/plugins/AlsaMixerPlugin.cxx
+++ b/src/mixer/plugins/AlsaMixerPlugin.cxx
@@ -26,7 +26,6 @@
#include "event/DeferEvent.hxx"
#include "event/Call.hxx"
#include "util/ASCII.hxx"
-#include "util/ReusableArray.hxx"
#include "util/Domain.hxx"
#include "util/RuntimeError.hxx"
#include "Log.hxx"
@@ -48,7 +47,7 @@ class AlsaMixerMonitor final : MultiSocketMonitor {
snd_mixer_t *mixer;
- ReusableArray<pollfd> pfd_buffer;
+ AlsaNonBlockMixer non_block;
public:
AlsaMixerMonitor(EventLoop &_loop, snd_mixer_t *_mixer)
@@ -110,7 +109,7 @@ AlsaMixerMonitor::PrepareSockets() noexcept
return std::chrono::steady_clock::duration(-1);
}
- return PrepareAlsaMixerSockets(*this, mixer, pfd_buffer);
+ return non_block.PrepareSockets(*this, mixer);
}
void