MixerPlugin: add EventLoop& init() parameter

9 files changed, 25 insertions, 14 deletions

diff --git a/src/mixer/MixerControl.cxx b/src/mixer/MixerControl.cxx
index bdf6fcc2b..d64ff2c8e 100644
--- a/src/mixer/MixerControl.cxx
+++ b/src/mixer/MixerControl.cxx
@@ -25,7 +25,8 @@
 #include <assert.h>
 
 Mixer *
-mixer_new(const struct mixer_plugin *plugin, void *ao,
+mixer_new(EventLoop &event_loop,
+	  const mixer_plugin *plugin, void *ao,
 	  const config_param &param,
 	  Error &error)
 {
@@ -33,7 +34,7 @@ mixer_new(const struct mixer_plugin *plugin, void *ao,
 
 	assert(plugin != nullptr);
 
-	mixer = plugin->init(ao, param, error);
+	mixer = plugin->init(event_loop, ao, param, error);
 
 	assert(mixer == nullptr || mixer->IsPlugin(*plugin));
 
diff --git a/src/mixer/MixerControl.hxx b/src/mixer/MixerControl.hxx
index 3f8e11e86..8ffc683f4 100644
--- a/src/mixer/MixerControl.hxx
+++ b/src/mixer/MixerControl.hxx
@@ -27,11 +27,12 @@
 
 class Error;
 class Mixer;
+class EventLoop;
 struct mixer_plugin;
 struct config_param;
 
 Mixer *
-mixer_new(const mixer_plugin *plugin, void *ao,
+mixer_new(EventLoop &event_loop, const mixer_plugin *plugin, void *ao,
 	  const config_param &param,
 	  Error &error);
 
diff --git a/src/mixer/MixerPlugin.hxx b/src/mixer/MixerPlugin.hxx
index 2df0d809e..79ba378a0 100644
--- a/src/mixer/MixerPlugin.hxx
+++ b/src/mixer/MixerPlugin.hxx
@@ -29,6 +29,7 @@
 
 struct config_param;
 class Mixer;
+class EventLoop;
 class Error;
 
 struct mixer_plugin {
@@ -41,7 +42,8 @@ struct mixer_plugin {
 	 * nullptr to ignore errors
 	 * @return a mixer object, or nullptr on error
 	 */
-	Mixer *(*init)(void *ao, const config_param &param,
+	Mixer *(*init)(EventLoop &event_loop, void *ao,
+		       const config_param &param,
 		       Error &error);
 
 	/**
diff --git a/src/mixer/plugins/AlsaMixerPlugin.cxx b/src/mixer/plugins/AlsaMixerPlugin.cxx
index a15820fc7..6e99cfa3e 100644
--- a/src/mixer/plugins/AlsaMixerPlugin.cxx
+++ b/src/mixer/plugins/AlsaMixerPlugin.cxx
@@ -21,7 +21,6 @@
 #include "mixer/MixerInternal.hxx"
 #include "output/OutputAPI.hxx"
 #include "GlobalEvents.hxx"
-#include "Main.hxx"
 #include "event/MultiSocketMonitor.hxx"
 #include "event/DeferredMonitor.hxx"
 #include "event/Loop.hxx"
@@ -62,6 +61,8 @@ private:
 };
 
 class AlsaMixer final : public Mixer {
+	EventLoop &event_loop;
+
 	const char *device;
 	const char *control;
 	unsigned int index;
@@ -75,7 +76,8 @@ class AlsaMixer final : public Mixer {
 	AlsaMixerMonitor *monitor;
 
 public:
-	AlsaMixer():Mixer(alsa_mixer_plugin) {}
+	AlsaMixer(EventLoop &_event_loop)
+		:Mixer(alsa_mixer_plugin), event_loop(_event_loop) {}
 
 	void Configure(const config_param &param);
 	bool Setup(Error &error);
@@ -162,10 +164,11 @@ AlsaMixer::Configure(const config_param &param)
 }
 
 static Mixer *
-alsa_mixer_init(gcc_unused void *ao, const config_param &param,
+alsa_mixer_init(EventLoop &event_loop, gcc_unused void *ao,
+		const config_param &param,
 		gcc_unused Error &error)
 {
-	AlsaMixer *am = new AlsaMixer();
+	AlsaMixer *am = new AlsaMixer(event_loop);
 	am->Configure(param);
 
 	return am;
@@ -237,7 +240,7 @@ AlsaMixer::Setup(Error &error)
 
 	snd_mixer_elem_set_callback(elem, alsa_mixer_elem_callback);
 
-	monitor = new AlsaMixerMonitor(*main_loop, handle);
+	monitor = new AlsaMixerMonitor(event_loop, handle);
 
 	return true;
 }
diff --git a/src/mixer/plugins/OssMixerPlugin.cxx b/src/mixer/plugins/OssMixerPlugin.cxx
index 095ace015..96dade06e 100644
--- a/src/mixer/plugins/OssMixerPlugin.cxx
+++ b/src/mixer/plugins/OssMixerPlugin.cxx
@@ -96,7 +96,8 @@ OssMixer::Configure(const config_param &param, Error &error)
 }
 
 static Mixer *
-oss_mixer_init(gcc_unused void *ao, const config_param &param,
+oss_mixer_init(gcc_unused EventLoop &event_loop, gcc_unused void *ao,
+	       const config_param &param,
 	       Error &error)
 {
 	OssMixer *om = new OssMixer();
diff --git a/src/mixer/plugins/PulseMixerPlugin.cxx b/src/mixer/plugins/PulseMixerPlugin.cxx
index 4df88d06b..636656081 100644
--- a/src/mixer/plugins/PulseMixerPlugin.cxx
+++ b/src/mixer/plugins/PulseMixerPlugin.cxx
@@ -143,7 +143,8 @@ pulse_mixer_on_change(PulseMixer *pm,
 }
 
 static Mixer *
-pulse_mixer_init(void *ao, gcc_unused const config_param &param,
+pulse_mixer_init(gcc_unused EventLoop &event_loop, void *ao,
+		 gcc_unused const config_param &param,
 		 Error &error)
 {
 	PulseOutput *po = (PulseOutput *)ao;
diff --git a/src/mixer/plugins/RoarMixerPlugin.cxx b/src/mixer/plugins/RoarMixerPlugin.cxx
index 958688cd7..ce0462520 100644
--- a/src/mixer/plugins/RoarMixerPlugin.cxx
+++ b/src/mixer/plugins/RoarMixerPlugin.cxx
@@ -34,7 +34,8 @@ struct RoarMixer final : public Mixer {
 };
 
 static Mixer *
-roar_mixer_init(void *ao, gcc_unused const config_param &param,
+roar_mixer_init(gcc_unused EventLoop &event_loop, void *ao,
+		gcc_unused const config_param &param,
 		gcc_unused Error &error)
 {
 	return new RoarMixer((RoarOutput *)ao);
diff --git a/src/mixer/plugins/SoftwareMixerPlugin.cxx b/src/mixer/plugins/SoftwareMixerPlugin.cxx
index 67ddee1a4..e5d4ba5ca 100644
--- a/src/mixer/plugins/SoftwareMixerPlugin.cxx
+++ b/src/mixer/plugins/SoftwareMixerPlugin.cxx
@@ -67,7 +67,7 @@ struct SoftwareMixer final : public Mixer {
 };
 
 static Mixer *
-software_mixer_init(gcc_unused void *ao,
+software_mixer_init(gcc_unused EventLoop &event_loop, gcc_unused void *ao,
 		    gcc_unused const config_param &param,
 		    gcc_unused Error &error)
 {
diff --git a/src/mixer/plugins/WinmmMixerPlugin.cxx b/src/mixer/plugins/WinmmMixerPlugin.cxx
index 093a026a9..c040b19fd 100644
--- a/src/mixer/plugins/WinmmMixerPlugin.cxx
+++ b/src/mixer/plugins/WinmmMixerPlugin.cxx
@@ -55,7 +55,8 @@ winmm_volume_encode(int volume)
 }
 
 static Mixer *
-winmm_mixer_init(void *ao, gcc_unused const config_param &param,
+winmm_mixer_init(gcc_unused EventLoop &event_loop, void *ao,
+		 gcc_unused const config_param &param,
 		 gcc_unused Error &error)
 {
 	assert(ao != nullptr);