mixer/alsa: fix deadlock

This deadlock was a regression by commit 8e38b4f8. Since we currently can't resolve this, let's revert the commit, and add a GLib specific workaround for the build failure.

mixer/alsa: fix deadlock
42a09ff1 · Max Kellermann · c170fed6 · 42a09ff1
Commit 42a09ff1 authored Dec 15, 2013 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

AlsaMixerPlugin.cxx src/mixer/AlsaMixerPlugin.cxx +13 -1

No files found.
--- a/src/mixer/AlsaMixerPlugin.cxx
+++ b/src/mixer/AlsaMixerPlugin.cxx
@@ -47,10 +47,22 @@ class AlsaMixerMonitor final : private MultiSocketMonitor {
 public:
 	AlsaMixerMonitor(EventLoop &_loop, snd_mixer_t *_mixer)
 		:MultiSocketMonitor(_loop), mixer(_mixer) {
-		BlockingCall(_loop, [this](){ InvalidateSockets(); });
+#ifdef USE_EPOLL
+		_loop.AddCall([this](){ InvalidateSockets(); });
+#else
+		_loop.AddIdle(InitAlsaMixerMonitor, this);
+#endif
 	}

 private:
+#ifndef USE_EPOLL
+	static gboolean InitAlsaMixerMonitor(gpointer data) {
+		AlsaMixerMonitor &amm = *(AlsaMixerMonitor *)data;
+		amm.InvalidateSockets();
+		return false;
+	}
+#endif
+
 	virtual int PrepareSockets() override;
 	virtual void DispatchSockets() override;
 };