oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

config/Param: split block-specific attributes to new struct ConfigBlock

Browse Source 
The old struct config_param remains only for top-level string options.
This commit is contained in:
Max Kellermann
2015-01-21 22:13:44 +01:00
parent 84e74173de
commit 4fa5538e2b
114 changed files with 871 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/output/plugins/httpd/HttpdInternal.hxx
View File

@@ -42,7 +42,7 @@
#include <queue>
#include <list>
struct config_param;
struct ConfigBlock;
class Error;
class EventLoop;
class ServerSocket;
@@ -162,16 +162,16 @@ public:
using DeferredMonitor::GetEventLoop;
bool Init(const config_param &param, Error &error);
bool Init(const ConfigBlock &block, Error &error);
bool Configure(const config_param &param, Error &error);
bool Configure(const ConfigBlock &block, Error &error);
AudioOutput *InitAndConfigure(const config_param &param,
AudioOutput *InitAndConfigure(const ConfigBlock &block,
Error &error) {
if (!Init(param, error))
if (!Init(block, error))
return nullptr;
if (!Configure(param, error))
if (!Configure(block, error))
return nullptr;
return &base;

26
src/output/plugins/httpd/HttpdOutputPlugin.cxx
View File

@@ -91,17 +91,17 @@ HttpdOutput::Unbind()
}
inline bool
HttpdOutput::Configure(const config_param &param, Error &error)
HttpdOutput::Configure(const ConfigBlock &block, Error &error)
{
/* read configuration */
name = param.GetBlockValue("name", "Set name in config");
genre = param.GetBlockValue("genre", "Set genre in config");
website = param.GetBlockValue("website", "Set website in config");
name = block.GetBlockValue("name", "Set name in config");
genre = block.GetBlockValue("genre", "Set genre in config");
website = block.GetBlockValue("website", "Set website in config");
unsigned port = param.GetBlockValue("port", 8000u);
unsigned port = block.GetBlockValue("port", 8000u);
const char *encoder_name =
param.GetBlockValue("encoder", "vorbis");
block.GetBlockValue("encoder", "vorbis");
const auto encoder_plugin = encoder_plugin_get(encoder_name);
if (encoder_plugin == nullptr) {
error.Format(httpd_output_domain,
@@ -109,11 +109,11 @@ HttpdOutput::Configure(const config_param &param, Error &error)
return false;
}
clients_max = param.GetBlockValue("max_clients", 0u);
clients_max = block.GetBlockValue("max_clients", 0u);
/* set up bind_to_address */
const char *bind_to_address = param.GetBlockValue("bind_to_address");
const char *bind_to_address = block.GetBlockValue("bind_to_address");
bool success = bind_to_address != nullptr &&
strcmp(bind_to_address, "any") != 0
? AddHost(bind_to_address, port, error)
@@ -123,7 +123,7 @@ HttpdOutput::Configure(const config_param &param, Error &error)
/* initialize encoder */
encoder = encoder_init(*encoder_plugin, param, error);
encoder = encoder_init(*encoder_plugin, block, error);
if (encoder == nullptr)
return false;
@@ -136,17 +136,17 @@ HttpdOutput::Configure(const config_param &param, Error &error)
}
inline bool
HttpdOutput::Init(const config_param &param, Error &error)
HttpdOutput::Init(const ConfigBlock &block, Error &error)
{
return base.Configure(param, error);
return base.Configure(block, error);
}
static AudioOutput *
httpd_output_init(const config_param &param, Error &error)
httpd_output_init(const ConfigBlock &block, Error &error)
{
HttpdOutput *httpd = new HttpdOutput(io_thread_get());
AudioOutput *result = httpd->InitAndConfigure(param, error);
AudioOutput *result = httpd->InitAndConfigure(block, error);
if (result == nullptr)
delete httpd;