From 4fa5538e2bed36903b403e1aaee2462d22b456dc Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 21 Jan 2015 22:13:44 +0100
Subject: config/Param: split block-specific attributes to new struct
 ConfigBlock

The old struct config_param remains only for top-level string options.
---
 src/output/plugins/AoOutputPlugin.cxx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/output/plugins/AoOutputPlugin.cxx')

diff --git a/src/output/plugins/AoOutputPlugin.cxx b/src/output/plugins/AoOutputPlugin.cxx
index 31edd371e..3c0cf74a4 100644
--- a/src/output/plugins/AoOutputPlugin.cxx
+++ b/src/output/plugins/AoOutputPlugin.cxx
@@ -46,11 +46,11 @@ struct AoOutput {
 	AoOutput()
 		:base(ao_output_plugin) {}
 
-	bool Initialize(const config_param &param, Error &error) {
-		return base.Configure(param, error);
+	bool Initialize(const ConfigBlock &block, Error &error) {
+		return base.Configure(block, error);
 	}
 
-	bool Configure(const config_param &param, Error &error);
+	bool Configure(const ConfigBlock &block, Error &error);
 };
 
 static constexpr Domain ao_output_domain("ao_output");
@@ -90,20 +90,20 @@ ao_output_error(Error &error_r)
 }
 
 inline bool
-AoOutput::Configure(const config_param &param, Error &error)
+AoOutput::Configure(const ConfigBlock &block, Error &error)
 {
 	const char *value;
 
 	options = nullptr;
 
-	write_size = param.GetBlockValue("write_size", 1024u);
+	write_size = block.GetBlockValue("write_size", 1024u);
 
 	if (ao_output_ref == 0) {
 		ao_initialize();
 	}
 	ao_output_ref++;
 
-	value = param.GetBlockValue("driver", "default");
+	value = block.GetBlockValue("driver", "default");
 	if (0 == strcmp(value, "default"))
 		driver = ao_default_driver_id();
 	else
@@ -123,9 +123,9 @@ AoOutput::Configure(const config_param &param, Error &error)
 	}
 
 	FormatDebug(ao_output_domain, "using ao driver \"%s\" for \"%s\"\n",
-		    ai->short_name, param.GetBlockValue("name", nullptr));
+		    ai->short_name, block.GetBlockValue("name", nullptr));
 
-	value = param.GetBlockValue("options", nullptr);
+	value = block.GetBlockValue("options", nullptr);
 	if (value != nullptr) {
 		for (const auto &i : SplitString(value, ';')) {
 			const DivideString ss(i.c_str(), '=', true);
@@ -145,16 +145,16 @@ AoOutput::Configure(const config_param &param, Error &error)
 }
 
 static AudioOutput *
-ao_output_init(const config_param &param, Error &error)
+ao_output_init(const ConfigBlock &block, Error &error)
 {
 	AoOutput *ad = new AoOutput();
 
-	if (!ad->Initialize(param, error)) {
+	if (!ad->Initialize(block, error)) {
 		delete ad;
 		return nullptr;
 	}
 
-	if (!ad->Configure(param, error)) {
+	if (!ad->Configure(block, error)) {
 		delete ad;
 		return nullptr;
 	}
-- 
cgit v1.2.3