config/Param: split block-specific attributes to new struct ConfigBlock
The old struct config_param remains only for top-level string options.
This commit is contained in:
@@ -61,9 +61,9 @@ osx_output_test_default_device(void)
|
||||
}
|
||||
|
||||
static void
|
||||
osx_output_configure(OSXOutput *oo, const config_param ¶m)
|
||||
osx_output_configure(OSXOutput *oo, const ConfigBlock &block)
|
||||
{
|
||||
const char *device = param.GetBlockValue("device");
|
||||
const char *device = block.GetBlockValue("device");
|
||||
|
||||
if (device == nullptr || 0 == strcmp(device, "default")) {
|
||||
oo->component_subtype = kAudioUnitSubType_DefaultOutput;
|
||||
@@ -81,15 +81,15 @@ osx_output_configure(OSXOutput *oo, const config_param ¶m)
|
||||
}
|
||||
|
||||
static AudioOutput *
|
||||
osx_output_init(const config_param ¶m, Error &error)
|
||||
osx_output_init(const ConfigBlock &block, Error &error)
|
||||
{
|
||||
OSXOutput *oo = new OSXOutput();
|
||||
if (!oo->base.Configure(param, error)) {
|
||||
if (!oo->base.Configure(block, error)) {
|
||||
delete oo;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
osx_output_configure(oo, param);
|
||||
osx_output_configure(oo, block);
|
||||
|
||||
return &oo->base;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user