From b09f43ab3ad366bef0c86a07c4ea9dc0103872ed Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 21 Aug 2015 04:03:59 +0200 Subject: [PATCH] Cleanups pt. 2 --- menu/menu.c | 5 +---- menu/menu_animation.c | 6 ++++-- menu/menu_animation.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/menu/menu.c b/menu/menu.c index bfd33c3339..b77070d89a 100644 --- a/menu/menu.c +++ b/menu/menu.c @@ -348,9 +348,6 @@ void menu_free(menu_handle_t *menu) int menu_iterate(retro_input_t input, retro_input_t old_input, retro_input_t trigger_input) { - menu_display_t *disp = menu_display_get_ptr(); - - menu_animation_update_time(disp->animation); - + menu_animation_update_time(); return menu_iterate_main(menu_input_frame(input, trigger_input)); } diff --git a/menu/menu_animation.c b/menu/menu_animation.c index 8a9e627d8b..609c5188b4 100644 --- a/menu/menu_animation.c +++ b/menu/menu_animation.c @@ -617,10 +617,12 @@ void menu_animation_ticker_str(char *s, size_t len, uint64_t idx, anim->is_active = true; } -void menu_animation_update_time(menu_animation_t *anim) +void menu_animation_update_time(void) { static retro_time_t last_clock_update = 0; - settings_t *settings = config_get_ptr(); + menu_display_t *disp = menu_display_get_ptr(); + menu_animation_t *anim = disp->animation; + settings_t *settings = config_get_ptr(); anim->cur_time = rarch_get_time_usec(); anim->delta_time = anim->cur_time - anim->old_time; diff --git a/menu/menu_animation.h b/menu/menu_animation.h index 48dd715e06..ed23f313ec 100644 --- a/menu/menu_animation.h +++ b/menu/menu_animation.h @@ -153,7 +153,7 @@ void menu_animation_ticker_generic(uint64_t idx, int max_width, menu_animation_t *menu_animation_get_ptr(void); -void menu_animation_update_time(menu_animation_t *anim); +void menu_animation_update_time(void); #ifdef __cplusplus }