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 870 additions and 731 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/output/plugins/RoarOutputPlugin.cxx
+10 -10
View File
@@ -60,11 +60,11 @@ public:
return &base;
}
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);
}
void Configure(const config_param &param);
void Configure(const ConfigBlock &block);
bool Open(AudioFormat &audio_format, Error &error);
void Close();
@@ -124,28 +124,28 @@ roar_output_set_volume(RoarOutput &roar, unsigned volume)
}
inline void
RoarOutput::Configure(const config_param &param)
RoarOutput::Configure(const ConfigBlock &block)
{
host = param.GetBlockValue("server", "");
name = param.GetBlockValue("name", "MPD");
host = block.GetBlockValue("server", "");
name = block.GetBlockValue("name", "MPD");
const char *_role = param.GetBlockValue("role", "music");
const char *_role = block.GetBlockValue("role", "music");
role = _role != nullptr
? roar_str2role(_role)
: ROAR_ROLE_MUSIC;
}
static AudioOutput *
roar_init(const config_param &param, Error &error)
roar_init(const ConfigBlock &block, Error &error)
{
RoarOutput *self = new RoarOutput();
if (!self->Initialize(param, error)) {
if (!self->Initialize(block, error)) {
delete self;
return nullptr;
}
self->Configure(param);
self->Configure(block);
return *self;
}