Merge branch 'v0.18.x'

2013-12-14 12:37:16 +01:00
parent d43aa12987 c170fed6f9
commit c7b1038a9d
12 changed files with 126 additions and 143 deletions
--- 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: