From 7c66d87c82ac6b06901e7cb39ed90db43bc4b053 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Sat, 19 Mar 2022 14:55:30 -0700 Subject: *: de-constify til_setting_t throughout Now that til_setting_t.desc is not only a thing, but a thing that is intended to be refreshed regularly in the course of things like GUI interactive settings construction, it's not really appropriate to try even act like this these are const anymore. --- src/modules/compose/compose.c | 4 ++-- src/modules/drizzle/drizzle.c | 2 +- src/modules/flui2d/flui2d.c | 2 +- src/modules/rtv/rtv.c | 6 +++--- src/modules/sparkler/sparkler.c | 2 +- src/modules/stars/stars.c | 2 +- src/modules/submit/submit.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/modules') diff --git a/src/modules/compose/compose.c b/src/modules/compose/compose.c index 3e5334b..0f6b8fc 100644 --- a/src/modules/compose/compose.c +++ b/src/modules/compose/compose.c @@ -39,7 +39,7 @@ typedef struct compose_context_t { static void * compose_create_context(unsigned ticks, unsigned num_cpus); static void compose_destroy_context(void *context); static void compose_prepare_frame(void *context, unsigned ticks, unsigned n_cpus, til_fb_fragment_t *fragment, til_fragmenter_t *res_fragmenter); -static int compose_setup(const til_settings_t *settings, const til_setting_t **res_setting, const til_setting_desc_t **res_desc); +static int compose_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc); static char *compose_default_layers[] = { "drizzle", "stars", "spiro", "plato", NULL }; static char **compose_layers; @@ -109,7 +109,7 @@ static void compose_prepare_frame(void *context, unsigned ticks, unsigned n_cpus } -static int compose_setup(const til_settings_t *settings, const til_setting_t **res_setting, const til_setting_desc_t **res_desc) +static int compose_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc) { const char *layers; int r; diff --git a/src/modules/drizzle/drizzle.c b/src/modules/drizzle/drizzle.c index f8d93bd..294d671 100644 --- a/src/modules/drizzle/drizzle.c +++ b/src/modules/drizzle/drizzle.c @@ -153,7 +153,7 @@ static void drizzle_render_fragment(void *context, unsigned ticks, unsigned cpu, } -static int drizzle_setup(const til_settings_t *settings, const til_setting_t **res_setting, const til_setting_desc_t **res_desc) +static int drizzle_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc) { const char *viscosity; const char *values[] = { diff --git a/src/modules/flui2d/flui2d.c b/src/modules/flui2d/flui2d.c index a4025c8..7a30c7e 100644 --- a/src/modules/flui2d/flui2d.c +++ b/src/modules/flui2d/flui2d.c @@ -283,7 +283,7 @@ static void flui2d_render_fragment(void *context, unsigned ticks, unsigned cpu, /* Settings hooks for configurable variables */ -static int flui2d_setup(const til_settings_t *settings, const til_setting_t **res_setting, const til_setting_desc_t **res_desc) +static int flui2d_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc) { const char *viscosity; const char *diffusion; diff --git a/src/modules/rtv/rtv.c b/src/modules/rtv/rtv.c index 47905ec..6464a8e 100644 --- a/src/modules/rtv/rtv.c +++ b/src/modules/rtv/rtv.c @@ -48,7 +48,7 @@ static void * rtv_create_context(unsigned ticks, unsigned num_cpus); static void rtv_destroy_context(void *context); static void rtv_prepare_frame(void *context, unsigned ticks, unsigned n_cpus, til_fb_fragment_t *fragment, til_fragmenter_t *res_fragmenter); static void rtv_finish_frame(void *context, unsigned ticks, til_fb_fragment_t *fragment); -static int rtv_setup(const til_settings_t *settings, const til_setting_t **res_setting, const til_setting_desc_t **res_desc); +static int rtv_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc); static unsigned rtv_duration = RTV_DURATION_SECS; static unsigned rtv_context_duration = RTV_CONTEXT_DURATION_SECS; @@ -95,7 +95,7 @@ static void randomize_channels(rtv_context_t *ctxt) static char * randomize_module_setup(const til_module_t *module) { til_settings_t *settings; - const til_setting_t *setting; + til_setting_t *setting; const til_setting_desc_t *desc; char *arg; @@ -308,7 +308,7 @@ static void rtv_finish_frame(void *context, unsigned ticks, til_fb_fragment_t *f } -static int rtv_setup(const til_settings_t *settings, const til_setting_t **res_setting, const til_setting_desc_t **res_desc) +static int rtv_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc) { const char *channels; const char *duration; diff --git a/src/modules/sparkler/sparkler.c b/src/modules/sparkler/sparkler.c index 5d11a9d..d09b948 100644 --- a/src/modules/sparkler/sparkler.c +++ b/src/modules/sparkler/sparkler.c @@ -96,7 +96,7 @@ static void sparkler_render_fragment(void *context, unsigned ticks, unsigned cpu /* Settings hooks for configurable variables */ -static int sparkler_setup(const til_settings_t *settings, const til_setting_t **res_setting, const til_setting_desc_t **res_desc) +static int sparkler_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc) { const char *show_bsp_leafs; const char *show_bsp_matches; diff --git a/src/modules/stars/stars.c b/src/modules/stars/stars.c index 1cc66c4..859fb1f 100644 --- a/src/modules/stars/stars.c +++ b/src/modules/stars/stars.c @@ -201,7 +201,7 @@ static void stars_render_fragment(void *context, unsigned ticks, unsigned cpu, t ctxt->offset_y = tmp_y; } -int stars_setup(const til_settings_t *settings, const til_setting_t **res_setting, const til_setting_desc_t **res_desc) +int stars_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc) { const char *rot_adj; const char *rot_adj_values[] = { diff --git a/src/modules/submit/submit.c b/src/modules/submit/submit.c index 1389444..db5cf29 100644 --- a/src/modules/submit/submit.c +++ b/src/modules/submit/submit.c @@ -322,7 +322,7 @@ static void submit_render_fragment(void *context, unsigned ticks, unsigned cpu, } -static int submit_setup(const til_settings_t *settings, const til_setting_t **res_setting, const til_setting_desc_t **res_desc) +static int submit_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc) { const char *values[] = { "off", -- cgit v1.2.3