MixerInternal: convert to class

1 files changed, 9 insertions, 11 deletions

diff --git a/src/mixer/RoarMixerPlugin.cxx b/src/mixer/RoarMixerPlugin.cxx
index a027f8570..0533711c1 100644
--- a/src/mixer/RoarMixerPlugin.cxx
+++ b/src/mixer/RoarMixerPlugin.cxx
@@ -24,26 +24,24 @@
 #include "output_api.h"
 #include "output/RoarOutputPlugin.hxx"
 
-struct RoarMixer {
+struct RoarMixer final : public Mixer {
 	/** the base mixer class */
-	struct mixer base;
 	RoarOutput *self;
 
-	RoarMixer(RoarOutput *_output):self(_output) {
-		mixer_init(&base, &roar_mixer_plugin);
-	}
+	RoarMixer(RoarOutput *_output)
+		:Mixer(roar_mixer_plugin),
+		self(_output) {}
 };
 
-static struct mixer *
+static Mixer *
 roar_mixer_init(void *ao, gcc_unused const struct config_param *param,
 		gcc_unused GError **error_r)
 {
-	RoarMixer *self = new RoarMixer((RoarOutput *)ao);
-	return &self->base;
+	return new RoarMixer((RoarOutput *)ao);
 }
 
 static void
-roar_mixer_finish(struct mixer *data)
+roar_mixer_finish(Mixer *data)
 {
 	RoarMixer *self = (RoarMixer *) data;
 
@@ -51,14 +49,14 @@ roar_mixer_finish(struct mixer *data)
 }
 
 static int
-roar_mixer_get_volume(struct mixer *mixer, gcc_unused GError **error_r)
+roar_mixer_get_volume(Mixer *mixer, gcc_unused GError **error_r)
 {
 	RoarMixer *self = (RoarMixer *)mixer;
 	return roar_output_get_volume(self->self);
 }
 
 static bool
-roar_mixer_set_volume(struct mixer *mixer, unsigned volume,
+roar_mixer_set_volume(Mixer *mixer, unsigned volume,
 		      gcc_unused GError **error_r)
 {
 	RoarMixer *self = (RoarMixer *)mixer;