diff --git a/src/bin/about.c b/src/bin/about.c index e61311e..918fa51 100644 --- a/src/bin/about.c +++ b/src/bin/about.c @@ -67,6 +67,5 @@ _key(const char *key) void about_start(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } diff --git a/src/bin/font_effect_blur_alpha.c b/src/bin/font_effect_blur_alpha.c index e2f6743..dc748eb 100644 --- a/src/bin/font_effect_blur_alpha.c +++ b/src/bin/font_effect_blur_alpha.c @@ -92,8 +92,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/font_effect_blur_color.c b/src/bin/font_effect_blur_color.c index 6669a7d..2e06423 100644 --- a/src/bin/font_effect_blur_color.c +++ b/src/bin/font_effect_blur_color.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c index 09331b9..c1bb495 100644 --- a/src/bin/image_blend_border.c +++ b/src/bin/image_blend_border.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c index 5f6545f..01c3af4 100644 --- a/src/bin/image_blend_border_recolor.c +++ b/src/bin/image_blend_border_recolor.c @@ -95,8 +95,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c index fc71d95..03ec8b2 100644 --- a/src/bin/image_blend_fade_pow2_unscaled.c +++ b/src/bin/image_blend_fade_pow2_unscaled.c @@ -96,8 +96,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c index 506a9ce..48315fa 100644 --- a/src/bin/image_blend_fade_unscaled.c +++ b/src/bin/image_blend_fade_unscaled.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c index 401f8d3..342b887 100644 --- a/src/bin/image_blend_many_smooth_same_scaled.c +++ b/src/bin/image_blend_many_smooth_same_scaled.c @@ -96,8 +96,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c index 2b8e69a..f8906d1 100644 --- a/src/bin/image_blend_nearest_same_scaled.c +++ b/src/bin/image_blend_nearest_same_scaled.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c index 2f9668c..e809765 100644 --- a/src/bin/image_blend_nearest_scaled.c +++ b/src/bin/image_blend_nearest_scaled.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c index 5328cf1..33cab02 100644 --- a/src/bin/image_blend_nearest_solid_same_scaled.c +++ b/src/bin/image_blend_nearest_solid_same_scaled.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c index 9347049..02f3842 100644 --- a/src/bin/image_blend_nearest_solid_scaled.c +++ b/src/bin/image_blend_nearest_solid_scaled.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c index f189d8f..da11d94 100644 --- a/src/bin/image_blend_occlude1.c +++ b/src/bin/image_blend_occlude1.c @@ -107,8 +107,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c index 450301d..1e7c8b6 100644 --- a/src/bin/image_blend_occlude1_few.c +++ b/src/bin/image_blend_occlude1_few.c @@ -112,8 +112,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c index 7cb95db..1f1de18 100644 --- a/src/bin/image_blend_occlude1_many.c +++ b/src/bin/image_blend_occlude1_many.c @@ -110,8 +110,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c index 381972c..f70d72c 100644 --- a/src/bin/image_blend_occlude1_very_many.c +++ b/src/bin/image_blend_occlude1_very_many.c @@ -110,8 +110,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c index ad9fdcd..fabc7e0 100644 --- a/src/bin/image_blend_occlude2.c +++ b/src/bin/image_blend_occlude2.c @@ -107,8 +107,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c index 6429550..6e8c28b 100644 --- a/src/bin/image_blend_occlude2_few.c +++ b/src/bin/image_blend_occlude2_few.c @@ -112,8 +112,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c index 38c440e..81f9eb5 100644 --- a/src/bin/image_blend_occlude2_many.c +++ b/src/bin/image_blend_occlude2_many.c @@ -110,8 +110,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c index daa5756..cadd4dc 100644 --- a/src/bin/image_blend_occlude2_very_many.c +++ b/src/bin/image_blend_occlude2_very_many.c @@ -110,8 +110,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c index 0d51e19..3c871f6 100644 --- a/src/bin/image_blend_occlude3.c +++ b/src/bin/image_blend_occlude3.c @@ -107,8 +107,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c index 12551c4..3f8b621 100644 --- a/src/bin/image_blend_occlude3_few.c +++ b/src/bin/image_blend_occlude3_few.c @@ -112,8 +112,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c index 2eaf099..5b417f9 100644 --- a/src/bin/image_blend_occlude3_many.c +++ b/src/bin/image_blend_occlude3_many.c @@ -110,8 +110,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c index 7ca1016..34d5801 100644 --- a/src/bin/image_blend_occlude3_very_many.c +++ b/src/bin/image_blend_occlude3_very_many.c @@ -110,8 +110,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c index 2c85610..d494620 100644 --- a/src/bin/image_blend_smooth_same_scaled.c +++ b/src/bin/image_blend_smooth_same_scaled.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c index 1e3ded1..7a365b1 100644 --- a/src/bin/image_blend_smooth_scaled.c +++ b/src/bin/image_blend_smooth_scaled.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c index d179f5a..db54056 100644 --- a/src/bin/image_blend_smooth_solid_same_scaled.c +++ b/src/bin/image_blend_smooth_solid_same_scaled.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c index 0789c9b..12be42c 100644 --- a/src/bin/image_blend_smooth_solid_scaled.c +++ b/src/bin/image_blend_smooth_solid_scaled.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_solid_9patch.c b/src/bin/image_blend_solid_9patch.c index 83f3c31..2b94691 100644 --- a/src/bin/image_blend_solid_9patch.c +++ b/src/bin/image_blend_solid_9patch.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c index dd2389c..2ebe579 100644 --- a/src/bin/image_blend_solid_border.c +++ b/src/bin/image_blend_solid_border.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c index 121e456..ee23eeb 100644 --- a/src/bin/image_blend_solid_fade_pow2_unscaled.c +++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c @@ -96,8 +96,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c index c7c99b8..1246ce1 100644 --- a/src/bin/image_blend_solid_fade_unscaled.c +++ b/src/bin/image_blend_solid_fade_unscaled.c @@ -95,8 +95,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c index 5cac27f..74928d0 100644 --- a/src/bin/image_blend_solid_middle_border.c +++ b/src/bin/image_blend_solid_middle_border.c @@ -95,8 +95,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c index e6fe9f1..a1e733a 100644 --- a/src/bin/image_blend_solid_middle_unscaled.c +++ b/src/bin/image_blend_solid_middle_unscaled.c @@ -93,8 +93,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_solid_stretch.c b/src/bin/image_blend_solid_stretch.c index f209760..ddb2c02 100644 --- a/src/bin/image_blend_solid_stretch.c +++ b/src/bin/image_blend_solid_stretch.c @@ -100,8 +100,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c index 14a6188..cc5ca2a 100644 --- a/src/bin/image_blend_solid_unscaled.c +++ b/src/bin/image_blend_solid_unscaled.c @@ -91,8 +91,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c index 1acb114..d7b34d9 100644 --- a/src/bin/image_blend_unscaled.c +++ b/src/bin/image_blend_unscaled.c @@ -91,8 +91,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c index e68e8b5..3ce7ea2 100644 --- a/src/bin/image_crossfade.c +++ b/src/bin/image_crossfade.c @@ -90,8 +90,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c index 0beb4e4..071b63e 100644 --- a/src/bin/image_data_argb.c +++ b/src/bin/image_data_argb.c @@ -129,8 +129,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c index 03618f6..ed506e5 100644 --- a/src/bin/image_data_argb_alpha.c +++ b/src/bin/image_data_argb_alpha.c @@ -141,8 +141,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c index 7578879..3c92d42 100644 --- a/src/bin/image_data_ycbcr601pl.c +++ b/src/bin/image_data_ycbcr601pl.c @@ -115,8 +115,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c index 3170c33..22c9393 100644 --- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c +++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c @@ -121,8 +121,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c index d25ef3e..f3ef648 100644 --- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c +++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c @@ -120,8 +120,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c index 2a8933f..583445d 100644 --- a/src/bin/image_data_ycbcr601pl_wide_stride.c +++ b/src/bin/image_data_ycbcr601pl_wide_stride.c @@ -141,8 +141,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c index ae44618..2f64bf6 100644 --- a/src/bin/image_map_3d_1.c +++ b/src/bin/image_map_3d_1.c @@ -251,8 +251,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c index c2c7b0a..e8e30b7 100644 --- a/src/bin/image_map_3d_2.c +++ b/src/bin/image_map_3d_2.c @@ -249,8 +249,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c index 8f70c41..09a6a46 100644 --- a/src/bin/image_map_3d_3.c +++ b/src/bin/image_map_3d_3.c @@ -243,8 +243,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c index d12f5b1..91c208d 100644 --- a/src/bin/image_map_3d_4.c +++ b/src/bin/image_map_3d_4.c @@ -241,8 +241,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c index c72ce60..251e2cd 100644 --- a/src/bin/image_map_3d_5.c +++ b/src/bin/image_map_3d_5.c @@ -231,8 +231,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c index 1332213..3f2de9f 100644 --- a/src/bin/image_map_3d_6.c +++ b/src/bin/image_map_3d_6.c @@ -228,8 +228,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c index 18f9aa6..cc40eb7 100644 --- a/src/bin/image_map_3d_flow.c +++ b/src/bin/image_map_3d_flow.c @@ -220,8 +220,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c index 951d523..7344fd1 100644 --- a/src/bin/image_map_color_alpha_nearest_rotate.c +++ b/src/bin/image_map_color_alpha_nearest_rotate.c @@ -107,8 +107,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c index 474bf42..7a767be 100644 --- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c +++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c @@ -107,8 +107,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c index 2d30005..73d92d5 100644 --- a/src/bin/image_map_color_alpha_rotate.c +++ b/src/bin/image_map_color_alpha_rotate.c @@ -105,8 +105,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c index 31a6be0..40e0a22 100644 --- a/src/bin/image_map_color_alpha_solid_rotate.c +++ b/src/bin/image_map_color_alpha_solid_rotate.c @@ -104,8 +104,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c index 2a4441d..58df5df 100644 --- a/src/bin/image_map_color_nearest_rotate.c +++ b/src/bin/image_map_color_nearest_rotate.c @@ -107,8 +107,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c index 3406900..3bce8cb 100644 --- a/src/bin/image_map_color_nearest_solid_rotate.c +++ b/src/bin/image_map_color_nearest_solid_rotate.c @@ -107,8 +107,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c index e8ccf56..4499c8f 100644 --- a/src/bin/image_map_color_rotate.c +++ b/src/bin/image_map_color_rotate.c @@ -105,8 +105,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c index 4841f28..ad9a669 100644 --- a/src/bin/image_map_color_solid_rotate.c +++ b/src/bin/image_map_color_solid_rotate.c @@ -105,8 +105,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c index 95204b3..a673499 100644 --- a/src/bin/image_map_nearest_rotate.c +++ b/src/bin/image_map_nearest_rotate.c @@ -102,8 +102,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c index 7c041f8..c67c399 100644 --- a/src/bin/image_map_nearest_solid_rotate.c +++ b/src/bin/image_map_nearest_solid_rotate.c @@ -102,8 +102,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c index f4fa2f5..37fe872 100644 --- a/src/bin/image_map_rotate.c +++ b/src/bin/image_map_rotate.c @@ -100,8 +100,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c index df8a8ba..78989cc 100644 --- a/src/bin/image_map_solid_rotate.c +++ b/src/bin/image_map_solid_rotate.c @@ -100,8 +100,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c index 32c9a39..d0986b1 100644 --- a/src/bin/image_mask.c +++ b/src/bin/image_mask.c @@ -101,8 +101,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c index 12a6934..5ade4b9 100644 --- a/src/bin/image_mask_10.c +++ b/src/bin/image_mask_10.c @@ -107,8 +107,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c index 6ee1021..f6605f6 100644 --- a/src/bin/image_mask_11.c +++ b/src/bin/image_mask_11.c @@ -113,8 +113,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c index b05f89e..afdab5e 100644 --- a/src/bin/image_mask_12.c +++ b/src/bin/image_mask_12.c @@ -109,8 +109,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c index da1fa54..834971c 100644 --- a/src/bin/image_mask_13.c +++ b/src/bin/image_mask_13.c @@ -109,8 +109,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c index 3c70ac7..cedba74 100644 --- a/src/bin/image_mask_2.c +++ b/src/bin/image_mask_2.c @@ -101,8 +101,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c index 2f4f6f9..93ac9e6 100644 --- a/src/bin/image_mask_3.c +++ b/src/bin/image_mask_3.c @@ -101,8 +101,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c index 41ec6dd..e70d319 100644 --- a/src/bin/image_mask_4.c +++ b/src/bin/image_mask_4.c @@ -103,8 +103,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c index d5d2a8a..1e2b716 100644 --- a/src/bin/image_mask_5.c +++ b/src/bin/image_mask_5.c @@ -103,8 +103,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c index 2d14cd3..45c4f92 100644 --- a/src/bin/image_mask_6.c +++ b/src/bin/image_mask_6.c @@ -103,8 +103,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c index d3bfad0..72ed9f0 100644 --- a/src/bin/image_mask_7.c +++ b/src/bin/image_mask_7.c @@ -108,8 +108,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c index 2ce2509..02a5ddc 100644 --- a/src/bin/image_mask_8.c +++ b/src/bin/image_mask_8.c @@ -103,8 +103,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c index 0c5ea25..d443bc2 100644 --- a/src/bin/image_mask_9.c +++ b/src/bin/image_mask_9.c @@ -114,8 +114,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_mask_clipped.c b/src/bin/image_mask_clipped.c index 825ac10..f2ec807 100644 --- a/src/bin/image_mask_clipped.c +++ b/src/bin/image_mask_clipped.c @@ -124,8 +124,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c index 5dc7a85..251021f 100644 --- a/src/bin/image_quality_scale.c +++ b/src/bin/image_quality_scale.c @@ -94,8 +94,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c index c792448..559a413 100644 --- a/src/bin/line_blend.c +++ b/src/bin/line_blend.c @@ -129,8 +129,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c index 33e7aa2..aa5d1ef 100644 --- a/src/bin/poly_blend.c +++ b/src/bin/poly_blend.c @@ -143,8 +143,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c index c0e4ae7..ac23f92 100644 --- a/src/bin/proxy_image.c +++ b/src/bin/proxy_image.c @@ -100,8 +100,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/proxy_image_clipped.c b/src/bin/proxy_image_clipped.c index 3918cd0..7a90070 100644 --- a/src/bin/proxy_image_clipped.c +++ b/src/bin/proxy_image_clipped.c @@ -114,8 +114,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c index 20e230e..df7655f 100644 --- a/src/bin/proxy_image_offscreen.c +++ b/src/bin/proxy_image_offscreen.c @@ -103,8 +103,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c index 4d03c28..8ad5104 100644 --- a/src/bin/proxy_text_fixed.c +++ b/src/bin/proxy_text_fixed.c @@ -116,8 +116,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c index eb0d3a2..bfe596c 100644 --- a/src/bin/proxy_text_random.c +++ b/src/bin/proxy_text_random.c @@ -133,8 +133,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/proxy_textblock.c b/src/bin/proxy_textblock.c index 32aa4e2..13fd37f 100644 --- a/src/bin/proxy_textblock.c +++ b/src/bin/proxy_textblock.c @@ -158,8 +158,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c index 58d0611..f8099de 100644 --- a/src/bin/rect_blend.c +++ b/src/bin/rect_blend.c @@ -99,8 +99,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c index ba1c9b4..64cabd3 100644 --- a/src/bin/rect_blend_few.c +++ b/src/bin/rect_blend_few.c @@ -102,8 +102,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c index b8f5ecc..cdb3f48 100644 --- a/src/bin/rect_blend_pow2.c +++ b/src/bin/rect_blend_pow2.c @@ -100,8 +100,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c index c4b8480..2503ea3 100644 --- a/src/bin/rect_blend_pow2_few.c +++ b/src/bin/rect_blend_pow2_few.c @@ -103,8 +103,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c index 2117680..b22c7f6 100644 --- a/src/bin/rect_solid.c +++ b/src/bin/rect_solid.c @@ -99,8 +99,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c index c64ea2f..e0877a9 100644 --- a/src/bin/rect_solid_few.c +++ b/src/bin/rect_solid_few.c @@ -102,8 +102,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c index 6f78c2a..069f2e6 100644 --- a/src/bin/snapshot_widgets_file_icons.c +++ b/src/bin/snapshot_widgets_file_icons.c @@ -195,8 +195,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c index d5391e3..4df7414 100644 --- a/src/bin/text_basic.c +++ b/src/bin/text_basic.c @@ -93,8 +93,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/text_change.c b/src/bin/text_change.c index d822abb..64b60c2 100644 --- a/src/bin/text_change.c +++ b/src/bin/text_change.c @@ -116,8 +116,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c index f3f0d0f..ffe76f2 100644 --- a/src/bin/text_styles.c +++ b/src/bin/text_styles.c @@ -102,8 +102,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c index 02a2507..e4a7e5a 100644 --- a/src/bin/text_styles_different_strings.c +++ b/src/bin/text_styles_different_strings.c @@ -116,8 +116,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c index 418409e..1b0cf25 100644 --- a/src/bin/textblock_auto_align.c +++ b/src/bin/textblock_auto_align.c @@ -112,8 +112,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c index 9736ac4..7fa156f 100644 --- a/src/bin/textblock_basic.c +++ b/src/bin/textblock_basic.c @@ -176,8 +176,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c index 3a9c49a..8317357 100644 --- a/src/bin/textblock_intl.c +++ b/src/bin/textblock_intl.c @@ -146,8 +146,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c index a865ad6..a9f726b 100644 --- a/src/bin/textblock_text_append.c +++ b/src/bin/textblock_text_append.c @@ -164,8 +164,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/textblock_text_fill_format.c b/src/bin/textblock_text_fill_format.c index 7c941fb..8b938cf 100644 --- a/src/bin/textblock_text_fill_format.c +++ b/src/bin/textblock_text_fill_format.c @@ -106,8 +106,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/ui.c b/src/bin/ui.c index 7dbabdf..6021cc7 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c @@ -651,7 +651,7 @@ ui_menu(void) } void -ui_func_set(void (*kfunc) (const char *key), void (*lfunc) (double t, int f)) +ui_func_set(void (*kfunc) (const char *key), void (*lfunc) (double t, int f), void (*lsetup) (void)) { key_func = kfunc; loop_func = lfunc; @@ -659,6 +659,8 @@ ui_func_set(void (*kfunc) (const char *key), void (*lfunc) (double t, int f)) f_loop = f_start = 0; ui_fps(0.0); + lsetup(); + if (tick) { ecore_animator_source_set(ECORE_ANIMATOR_SOURCE_CUSTOM); diff --git a/src/bin/ui.h b/src/bin/ui.h index 568faf3..b94b7ac 100644 --- a/src/bin/ui.h +++ b/src/bin/ui.h @@ -19,7 +19,7 @@ extern double weights[]; void ui_setup(unsigned int ui_w, unsigned int ui_h); Eina_Bool ui_loop(void *data); void ui_menu(void); -void ui_func_set(void (*kfunc) (const char *key), void (*lfunc) (double t, int f)); +void ui_func_set(void (*kfunc) (const char *key), void (*lfunc) (double t, int f), void (*lsetup) (void)); void ui_fps(double fps); void ui_num(int n); void ui_all(void); diff --git a/src/bin/vg_basic_circle.c b/src/bin/vg_basic_circle.c index 5772289..fc6f22d 100644 --- a/src/bin/vg_basic_circle.c +++ b/src/bin/vg_basic_circle.c @@ -104,8 +104,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/vg_basic_gradient.c b/src/bin/vg_basic_gradient.c index d7cacc1..db3b4ce 100644 --- a/src/bin/vg_basic_gradient.c +++ b/src/bin/vg_basic_gradient.c @@ -117,8 +117,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/vg_basic_rect.c b/src/bin/vg_basic_rect.c index 510318a..06b282f 100644 --- a/src/bin/vg_basic_rect.c +++ b/src/bin/vg_basic_rect.c @@ -104,8 +104,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/vg_scaled.c b/src/bin/vg_scaled.c index 8937df4..dec01f6 100644 --- a/src/bin/vg_scaled.c +++ b/src/bin/vg_scaled.c @@ -134,8 +134,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c index 21ec39b..294013d 100644 --- a/src/bin/widgets_file_icons.c +++ b/src/bin/widgets_file_icons.c @@ -133,8 +133,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c index ba45e7e..aad4cda 100644 --- a/src/bin/widgets_file_icons_2.c +++ b/src/bin/widgets_file_icons_2.c @@ -131,8 +131,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c index 61e9b7f..61fecce 100644 --- a/src/bin/widgets_file_icons_2_grouped.c +++ b/src/bin/widgets_file_icons_2_grouped.c @@ -140,8 +140,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c index b61377a..68d3fca 100644 --- a/src/bin/widgets_file_icons_2_same.c +++ b/src/bin/widgets_file_icons_2_same.c @@ -116,8 +116,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c index 447bbd8..f47bb47 100644 --- a/src/bin/widgets_file_icons_2_same_grouped.c +++ b/src/bin/widgets_file_icons_2_same_grouped.c @@ -120,8 +120,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c index ed19400..ba0cc9a 100644 --- a/src/bin/widgets_file_icons_3.c +++ b/src/bin/widgets_file_icons_3.c @@ -131,8 +131,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c index 7050bbd..9cf307e 100644 --- a/src/bin/widgets_file_icons_4.c +++ b/src/bin/widgets_file_icons_4.c @@ -131,8 +131,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c index a2f0fa4..7f6218e 100644 --- a/src/bin/widgets_list_1.c +++ b/src/bin/widgets_list_1.c @@ -142,8 +142,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c index f1d1d15..8cf956c 100644 --- a/src/bin/widgets_list_1_grouped.c +++ b/src/bin/widgets_list_1_grouped.c @@ -150,8 +150,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c index 877b0b0..3d0d683 100644 --- a/src/bin/widgets_list_2.c +++ b/src/bin/widgets_list_2.c @@ -142,8 +142,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c index 0f849c4..07610ac 100644 --- a/src/bin/widgets_list_2_grouped.c +++ b/src/bin/widgets_list_2_grouped.c @@ -150,8 +150,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c index c391f1a..6d48791 100644 --- a/src/bin/widgets_list_3.c +++ b/src/bin/widgets_list_3.c @@ -172,8 +172,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c index d60ee7a..f92cece 100644 --- a/src/bin/widgets_list_3_grouped.c +++ b/src/bin/widgets_list_3_grouped.c @@ -189,8 +189,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c index a79d5fa..b5558b7 100644 --- a/src/bin/widgets_list_4.c +++ b/src/bin/widgets_list_4.c @@ -169,8 +169,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c index b9ddcb2..67bb807 100644 --- a/src/bin/widgets_list_4_grouped.c +++ b/src/bin/widgets_list_4_grouped.c @@ -188,8 +188,7 @@ void FNAME(void); # ifndef UI void FNAME(void) { - _setup(); - ui_func_set(_key, _loop); + ui_func_set(_key, _loop, _setup); } # endif #endif