aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-12-13 14:35:36 +0100
committerMax Kellermann <max@duempel.org>2013-12-13 14:35:36 +0100
commit8e38b4f83c98ae61e9f843c3d770dcbac699c98c (patch)
tree6f168278f649df32fc03430ddf1a1fede367f0a0
parentdb4ae19246a32df27cfe4d487f9e1aaec8673440 (diff)
downloadmpd-8e38b4f83c98ae61e9f843c3d770dcbac699c98c.tar.gz
mpd-8e38b4f83c98ae61e9f843c3d770dcbac699c98c.tar.xz
mpd-8e38b4f83c98ae61e9f843c3d770dcbac699c98c.zip
mixer/alsa: use BlockingCall() instead of EventLoop::AddCall()
This is safer, and works without epoll(). Fixes a build failure with uClibc, which does not support epoll().
-rw-r--r--NEWS2
-rw-r--r--src/mixer/AlsaMixerPlugin.cxx3
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index cf886eda4..f789af2b1 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ ver 0.18.6 (not yet released)
* output
- openal: fix build failure on Mac OS X
- osx: fix build failure
+* mixer
+ - alsa: fix build failure with uClibc
* accept files without metadata
ver 0.18.5 (2013/11/23)
diff --git a/src/mixer/AlsaMixerPlugin.cxx b/src/mixer/AlsaMixerPlugin.cxx
index 7defdd7be..b81ca4246 100644
--- a/src/mixer/AlsaMixerPlugin.cxx
+++ b/src/mixer/AlsaMixerPlugin.cxx
@@ -24,6 +24,7 @@
#include "Main.hxx"
#include "event/MultiSocketMonitor.hxx"
#include "event/Loop.hxx"
+#include "event/Call.hxx"
#include "util/ASCII.hxx"
#include "util/ReusableArray.hxx"
#include "util/Error.hxx"
@@ -46,7 +47,7 @@ class AlsaMixerMonitor final : private MultiSocketMonitor {
public:
AlsaMixerMonitor(EventLoop &_loop, snd_mixer_t *_mixer)
:MultiSocketMonitor(_loop), mixer(_mixer) {
- _loop.AddCall([this](){ InvalidateSockets(); });
+ BlockingCall(_loop, [this](){ InvalidateSockets(); });
}
private: