diff options
| author | Vito Caputo <vcaputo@pengaru.com> | 2023-08-04 19:51:13 -0700 |
|---|---|---|
| committer | Vito Caputo <vcaputo@pengaru.com> | 2023-08-04 19:51:13 -0700 |
| commit | 72e9eb1188e4889f23c50836d1ccd2206852e588 (patch) | |
| tree | af9b54c6d2358b3ea5cef972a99b72af79d3b64f /src/modules/rkt/rkt_scener.c | |
| parent | 802e366db7049f1d8fdab6f38f968bcf0c55b3ae (diff) | |
modules/rkt: utilize til_module_setup_full()
rkt_setup() and rkt_scener_update() had distinct implementations
for scene module setup. This consolidates that where trivial to
both use the new til_module_setup_full() with appropriate
parameters, wrapped up in rkt_scene_module_setup().
The finalizing phase is still ad-hoc which is mildly annoying,
but if finalizing just passed into rkt_scene_module_setup() there
wouldn't be the til_module_t onhand for sticking in rkt_scene_t.
So the code to extract and lookup the module from the settings
would still be needed anyways, as the whole til setup_func api
isn't limited to modules so the baked til_setup_t doesn't come
back with a til_module_t hanging in there. Maybe in the future
this gets changed a bit, there could for instance be a void* in
til_setup_t where something usage-specific goes, like the
relevant module in the case of a module's setup. Something to
consider for the future.
Consolidating these in the pre-finalize phase at least ensures
consistent behavior in initial rkt::scenes setup vs. scener
editing/new scenes.
Diffstat (limited to 'src/modules/rkt/rkt_scener.c')
| -rw-r--r-- | src/modules/rkt/rkt_scener.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/rkt/rkt_scener.c b/src/modules/rkt/rkt_scener.c index 6b3f8bb..c272caa 100644 --- a/src/modules/rkt/rkt_scener.c +++ b/src/modules/rkt/rkt_scener.c @@ -993,7 +993,7 @@ int rkt_scener_update(rkt_context_t *ctxt) case RKT_SCENER_FSM_SEND_NEWSCENE_SETUP: { int r; - r = til_module_setup(scener->new_scene.settings, + r = rkt_scene_module_setup(scener->new_scene.settings, &scener->new_scene.cur_setting, &scener->new_scene.cur_desc, NULL); /* res_setup deliberately left NULL for two reasons: |