til_setup,*: add til_setup_t.creator pointer

Particularly with nested modules it's annoying to have to stow
the module separate from the setup during the setup process.

If the baked setup included the module pointer in the
non-module-specific-setup part of the setup, then nested settings
could finalize using the generic module setup wrapper and just
rely on this til_setup_t.creator pointer to contain the
appropriate module.  Which should enable tossing out a bunch of
copy-n-pasta surrounding nested modules setup.

Note this has to be a void* since til_setup_t is a generic thing
used equally by both the fb code and the module code.  Hence why
this is called "creator" and not "module", as well as the void*
as opposed to til_module_t*.

Also if rototiller ever grows a sound backend, the setup
machinery will be reused there as well, and it'll be yet another
creator handle that isn't an til_fb_ops_t or a til_module_t.

It's assumed that the callers producing these setups won't be
trying to pass them to the wrong places i.e. a module setup
getting passed to an fb backend and vice versa.

I'm mildly annoyed about having to move the various til_module_t
blocks to above the module's foo_setup(), but it seemed like the
least annoying option.  This may be revisited.

1 files changed, 14 insertions, 12 deletions

diff --git a/src/modules/stars/stars.c b/src/modules/stars/stars.c
index 4e0b4fd..fff6792 100644
--- a/src/modules/stars/stars.c
+++ b/src/modules/stars/stars.c
@@ -248,6 +248,19 @@ static void stars_render_fragment(til_module_context_t *context, til_stream_t *s
 	}
 }
 
+int stars_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, til_setup_t **res_setup);
+
+til_module_t	stars_module = {
+	.create_context  = stars_create_context,
+	.destroy_context = stars_destroy_context,
+	.render_fragment = stars_render_fragment,
+	.setup = stars_setup,
+	.name = "stars",
+	.description = "Basic starfield",
+	.author = "Philip J Freeman <elektron@halo.nu>",
+	.flags = TIL_MODULE_OVERLAYABLE,
+};
+
 int stars_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, til_setup_t **res_setup)
 {
 	const char	*rot_adj;
@@ -280,7 +293,7 @@ int stars_setup(const til_settings_t *settings, til_setting_t **res_setting, con
 	if (res_setup) {
 		stars_setup_t	*setup;
 
-		setup = til_setup_new(settings, sizeof(*setup), NULL);
+		setup = til_setup_new(settings, sizeof(*setup), NULL, &stars_module);
 		if (!setup)
 			return -ENOMEM;
 
@@ -291,14 +304,3 @@ int stars_setup(const til_settings_t *settings, til_setting_t **res_setting, con
 
 	return 0;
 }
-
-til_module_t	stars_module = {
-	.create_context  = stars_create_context,
-	.destroy_context = stars_destroy_context,
-	.render_fragment = stars_render_fragment,
-	.setup = stars_setup,
-	.name = "stars",
-	.description = "Basic starfield",
-	.author = "Philip J Freeman <elektron@halo.nu>",
-	.flags = TIL_MODULE_OVERLAYABLE,
-};