diff options
author | Vito Caputo <vcaputo@pengaru.com> | 2023-05-30 14:12:23 -0700 |
---|---|---|
committer | Vito Caputo <vcaputo@pengaru.com> | 2023-05-30 14:12:23 -0700 |
commit | 3b43a50c3582f8f9bcd914ac886a94502b868657 (patch) | |
tree | 5981801a600a944f3c8ffa61f14831effe6e4f98 /src/modules/compose | |
parent | c94e4683956a09de468174ff37951abf7822d5a3 (diff) |
modules/*: utilize til_module_setup_finalize()
This replaces the few ad-hoc til_module_t.setup() setup-baking
callers with the new til_module_setup_finalize() which always
produces a til_setup_t having an appropriate path, even when
there is no til_module_t.setup() method.
Diffstat (limited to 'src/modules/compose')
-rw-r--r-- | src/modules/compose/compose.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/modules/compose/compose.c b/src/modules/compose/compose.c index 4f0a8c8..78a5fe1 100644 --- a/src/modules/compose/compose.c +++ b/src/modules/compose/compose.c @@ -477,13 +477,11 @@ static int compose_setup(const til_settings_t *settings, til_setting_t **res_set return -ENOMEM; } - if (layer_module->setup) { - r = layer_module->setup(layer_setting->value_as_nested_settings, res_setting, res_desc, &setup->layers[i].setup); - if (r < 0) { - til_setup_free(&setup->til_setup); + r = til_module_setup_finalize(layer_module, layer_setting->value_as_nested_settings, &setup->layers[i].setup); + if (r < 0) { + til_setup_free(&setup->til_setup); - return r; - } + return r; } } @@ -504,14 +502,11 @@ static int compose_setup(const til_settings_t *settings, til_setting_t **res_set return -ENOMEM; } - if (texture_module->setup) { - /* bake the texture settings */ - r = texture_module->setup(texture_settings, res_setting, res_desc, &setup->texture.setup); - if (r < 0) { - til_setup_free(&setup->til_setup); + r = til_module_setup_finalize(texture_module, texture_settings, &setup->texture.setup); + if (r < 0) { + til_setup_free(&setup->til_setup); - return r; - } + return r; } } |