output: move functions into the AudioOutput struct

16 files changed, 17 insertions, 17 deletions

diff --git a/src/output/plugins/AlsaOutputPlugin.cxx b/src/output/plugins/AlsaOutputPlugin.cxx
index 7b4156803..bea96d09f 100644
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -125,7 +125,7 @@ struct AlsaOutput {
 	}
 
 	bool Init(const config_param &param, Error &error) {
-		return ao_base_init(&base, param, error);
+		return base.Configure(param, error);
 	}
 };
 
diff --git a/src/output/plugins/AoOutputPlugin.cxx b/src/output/plugins/AoOutputPlugin.cxx
index d0020229f..af8c88fa1 100644
--- a/src/output/plugins/AoOutputPlugin.cxx
+++ b/src/output/plugins/AoOutputPlugin.cxx
@@ -46,7 +46,7 @@ struct AoOutput {
 		:base(ao_output_plugin) {}
 
 	bool Initialize(const config_param &param, Error &error) {
-		return ao_base_init(&base, param, error);
+		return base.Configure(param, error);
 	}
 
 	bool Configure(const config_param &param, Error &error);
diff --git a/src/output/plugins/FifoOutputPlugin.cxx b/src/output/plugins/FifoOutputPlugin.cxx
index 2c5151519..0c7fb421e 100644
--- a/src/output/plugins/FifoOutputPlugin.cxx
+++ b/src/output/plugins/FifoOutputPlugin.cxx
@@ -52,7 +52,7 @@ struct FifoOutput {
 		 created(false) {}
 
 	bool Initialize(const config_param &param, Error &error) {
-		return ao_base_init(&base, param, error);
+		return base.Configure(param, error);
 	}
 
 	bool Create(Error &error);
diff --git a/src/output/plugins/HttpdOutputPlugin.cxx b/src/output/plugins/HttpdOutputPlugin.cxx
index dc9e7e0b4..17a3df59a 100644
--- a/src/output/plugins/HttpdOutputPlugin.cxx
+++ b/src/output/plugins/HttpdOutputPlugin.cxx
@@ -137,7 +137,7 @@ HttpdOutput::Configure(const config_param &param, Error &error)
 inline bool
 HttpdOutput::Init(const config_param &param, Error &error)
 {
-	return ao_base_init(&base, param, error);
+	return base.Configure(param, error);
 }
 
 static AudioOutput *
diff --git a/src/output/plugins/JackOutputPlugin.cxx b/src/output/plugins/JackOutputPlugin.cxx
index 42179e813..e1dad7893 100644
--- a/src/output/plugins/JackOutputPlugin.cxx
+++ b/src/output/plugins/JackOutputPlugin.cxx
@@ -83,7 +83,7 @@ struct JackOutput {
 		:base(jack_output_plugin) {}
 
 	bool Initialize(const config_param &param, Error &error_r) {
-		return ao_base_init(&base, param, error_r);
+		return base.Configure(param, error_r);
 	}
 };
 
diff --git a/src/output/plugins/NullOutputPlugin.cxx b/src/output/plugins/NullOutputPlugin.cxx
index 3c13e700d..53140a475 100644
--- a/src/output/plugins/NullOutputPlugin.cxx
+++ b/src/output/plugins/NullOutputPlugin.cxx
@@ -33,7 +33,7 @@ struct NullOutput {
 		:base(null_output_plugin) {}
 
 	bool Initialize(const config_param &param, Error &error) {
-		return ao_base_init(&base, param, error);
+		return base.Configure(param, error);
 	}
 };
 
diff --git a/src/output/plugins/OSXOutputPlugin.cxx b/src/output/plugins/OSXOutputPlugin.cxx
index 6918b3378..13ac7b35e 100644
--- a/src/output/plugins/OSXOutputPlugin.cxx
+++ b/src/output/plugins/OSXOutputPlugin.cxx
@@ -84,7 +84,7 @@ static AudioOutput *
 osx_output_init(const config_param &param, Error &error)
 {
 	OSXOutput *oo = new OSXOutput();
-	if (!ao_base_init(&oo->base, param, error)) {
+	if (!oo->base.Configure(param, error)) {
 		delete oo;
 		return NULL;
 	}
diff --git a/src/output/plugins/OpenALOutputPlugin.cxx b/src/output/plugins/OpenALOutputPlugin.cxx
index b0f863374..344f23f4f 100644
--- a/src/output/plugins/OpenALOutputPlugin.cxx
+++ b/src/output/plugins/OpenALOutputPlugin.cxx
@@ -52,7 +52,7 @@ struct OpenALOutput {
 		:base(openal_output_plugin) {}
 
 	bool Initialize(const config_param &param, Error &error_r) {
-		return ao_base_init(&base, param, error_r);
+		return base.Configure(param, error_r);
 	}
 };
 
diff --git a/src/output/plugins/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx
index 69018e723..05b14b29f 100644
--- a/src/output/plugins/OssOutputPlugin.cxx
+++ b/src/output/plugins/OssOutputPlugin.cxx
@@ -83,7 +83,7 @@ struct OssOutput {
 		 fd(-1), device(nullptr) {}
 
 	bool Initialize(const config_param &param, Error &error_r) {
-		return ao_base_init(&base, param, error_r);
+		return base.Configure(param, error_r);
 	}
 };
 
diff --git a/src/output/plugins/PipeOutputPlugin.cxx b/src/output/plugins/PipeOutputPlugin.cxx
index 36ad0aa48..7a1f32258 100644
--- a/src/output/plugins/PipeOutputPlugin.cxx
+++ b/src/output/plugins/PipeOutputPlugin.cxx
@@ -38,7 +38,7 @@ struct PipeOutput {
 		:base(pipe_output_plugin) {}
 
 	bool Initialize(const config_param &param, Error &error) {
-		return ao_base_init(&base, param, error);
+		return base.Configure(param, error);
 	}
 
 	bool Configure(const config_param &param, Error &error);
diff --git a/src/output/plugins/PulseOutputPlugin.cxx b/src/output/plugins/PulseOutputPlugin.cxx
index dc1fc23b8..1f255718f 100644
--- a/src/output/plugins/PulseOutputPlugin.cxx
+++ b/src/output/plugins/PulseOutputPlugin.cxx
@@ -334,7 +334,7 @@ pulse_output_init(const config_param &param, Error &error)
 	g_setenv("PULSE_PROP_media.role", "music", true);
 
 	po = new PulseOutput();
-	if (!ao_base_init(&po->base, param, error)) {
+	if (!po->base.Configure(param, error)) {
 		delete po;
 		return nullptr;
 	}
diff --git a/src/output/plugins/RecorderOutputPlugin.cxx b/src/output/plugins/RecorderOutputPlugin.cxx
index 0ef693d84..87e23f55a 100644
--- a/src/output/plugins/RecorderOutputPlugin.cxx
+++ b/src/output/plugins/RecorderOutputPlugin.cxx
@@ -61,7 +61,7 @@ struct RecorderOutput {
 		:base(recorder_output_plugin) {}
 
 	bool Initialize(const config_param &param, Error &error_r) {
-		return ao_base_init(&base, param, error_r);
+		return base.Configure(param, error_r);
 	}
 
 	bool Configure(const config_param &param, Error &error);
diff --git a/src/output/plugins/RoarOutputPlugin.cxx b/src/output/plugins/RoarOutputPlugin.cxx
index 0fabecb31..dca9fa346 100644
--- a/src/output/plugins/RoarOutputPlugin.cxx
+++ b/src/output/plugins/RoarOutputPlugin.cxx
@@ -58,7 +58,7 @@ public:
 	}
 
 	bool Initialize(const config_param &param, Error &error) {
-		return ao_base_init(&base, param, error);
+		return base.Configure(param, error);
 	}
 
 	void Configure(const config_param &param);
diff --git a/src/output/plugins/ShoutOutputPlugin.cxx b/src/output/plugins/ShoutOutputPlugin.cxx
index 91dfd2477..e693274a7 100644
--- a/src/output/plugins/ShoutOutputPlugin.cxx
+++ b/src/output/plugins/ShoutOutputPlugin.cxx
@@ -69,7 +69,7 @@ struct ShoutOutput final {
 	}
 
 	bool Initialize(const config_param &param, Error &error) {
-		return ao_base_init(&base, param, error);
+		return base.Configure(param, error);
 	}
 
 	bool Configure(const config_param &param, Error &error);
diff --git a/src/output/plugins/SolarisOutputPlugin.cxx b/src/output/plugins/SolarisOutputPlugin.cxx
index a7cab2e1f..30745f97c 100644
--- a/src/output/plugins/SolarisOutputPlugin.cxx
+++ b/src/output/plugins/SolarisOutputPlugin.cxx
@@ -61,7 +61,7 @@ struct SolarisOutput {
 		:base(solaris_output_plugin) {}
 
 	bool Initialize(const config_param &param, Error &error_r) {
-		return ao_base_init(&base, param, error_r);
+		return base.Configure(param, error_r);
 	}
 };
 
diff --git a/src/output/plugins/WinmmOutputPlugin.cxx b/src/output/plugins/WinmmOutputPlugin.cxx
index b09d2e081..d61f2055a 100644
--- a/src/output/plugins/WinmmOutputPlugin.cxx
+++ b/src/output/plugins/WinmmOutputPlugin.cxx
@@ -52,7 +52,7 @@ struct WinmmOutput {
 	WinmmBuffer buffers[8];
 	unsigned next_buffer;
 
-	WinmmBuffer()
+	WinmmOutput()
 		:base(winmm_output_plugin) {}
 };
 
@@ -115,7 +115,7 @@ static AudioOutput *
 winmm_output_init(const config_param &param, Error &error)
 {
 	WinmmOutput *wo = new WinmmOutput();
-	if (!ao_base_init(&wo->base, param, error)) {
+	if (!wo->base.Configure(param, error)) {
 		delete wo;
 		return nullptr;
 	}