diff options
| -rw-r--r-- | src/modules/rkt/rkt_scener.c | 2 | ||||
| -rw-r--r-- | src/modules/rtv/rtv.c | 6 | ||||
| -rw-r--r-- | src/til.c | 2 | ||||
| -rw-r--r-- | src/til.h | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/modules/rkt/rkt_scener.c b/src/modules/rkt/rkt_scener.c index 446b998..11be927 100644 --- a/src/modules/rkt/rkt_scener.c +++ b/src/modules/rkt/rkt_scener.c @@ -644,7 +644,7 @@ static int rkt_scener_randomize_scene_settings(rkt_context_t *ctxt, unsigned sce return -ENOMEM; /* FIXME: seed reproducibility needs to be sorted out, maybe move seed into settings */ - til_module_setup_randomize(module, + til_module_settings_randomize(module, new_settings, rand_r(&ctxt->til_module_context.seed), &setup, diff --git a/src/modules/rtv/rtv.c b/src/modules/rtv/rtv.c index 14bc09b..36e21d4 100644 --- a/src/modules/rtv/rtv.c +++ b/src/modules/rtv/rtv.c @@ -201,7 +201,11 @@ static void setup_next_channel(rtv_context_t *ctxt, unsigned ticks) "channel", ctxt->channel->module->name /* XXX: this should come from the channel settings */); - (void) til_module_setup_randomize(ctxt->channel->module, settings, rand_r(&ctxt->til_module_context.seed), &ctxt->channel->module_setup, &settings_as_arg); + (void) til_module_settings_randomize(ctxt->channel->module, + settings, + rand_r(&ctxt->til_module_context.seed), + &ctxt->channel->module_setup, + &settings_as_arg); caption = txt_newf("Title: %s%s%s\nDescription: %s%s%s", ctxt->channel->module->name, ctxt->channel->module->author ? "\nAuthor: " : "", @@ -457,7 +457,7 @@ int til_module_setup(const til_settings_t *settings, til_setting_t **res_setting /* originally taken from rtv, this randomizes a module's setup @res_setup, args @res_arg * returns 0 on on setup successful with results stored @res_*, -errno on error. */ -int til_module_setup_randomize(const til_module_t *module, til_settings_t *settings, unsigned seed, til_setup_t **res_setup, char **res_arg) +int til_module_settings_randomize(const til_module_t *module, til_settings_t *settings, unsigned seed, til_setup_t **res_setup, char **res_arg) { til_setting_t *setting; const char *name; @@ -52,8 +52,8 @@ int til_module_create_context(const til_module_t *module, til_stream_t *stream, til_module_context_t * til_module_destroy_context(til_module_context_t *context, til_stream_t *stream); int til_module_setup_full(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, til_setup_t **res_setup, const char *name, const char *preferred, unsigned flags_excluded, const char **exclusions); int til_module_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, til_setup_t **res_setup); -int til_module_setup_randomize(const til_module_t *module, til_settings_t *settings, unsigned seed, til_setup_t **res_setup, char **res_arg); int til_module_setup_finalize(const til_module_t *module, const til_settings_t *module_settings, til_setup_t **res_setup); +int til_module_settings_randomize(const til_module_t *module, til_settings_t *settings, unsigned seed, til_setup_t **res_setup, char **res_arg); int til_fragmenter_slice_per_cpu(til_module_context_t *context, const til_fb_fragment_t *fragment, unsigned number, til_fb_fragment_t *res_fragment); int til_fragmenter_slice_per_cpu_x16(til_module_context_t *context, const til_fb_fragment_t *fragment, unsigned number, til_fb_fragment_t *res_fragment); int til_fragmenter_tile64(til_module_context_t *context, const til_fb_fragment_t *fragment, unsigned number, til_fb_fragment_t *res_fragment); |