diff --git a/menu/menu_animation.c b/menu/menu_animation.c index d7bc7bd707..db3af993cb 100644 --- a/menu/menu_animation.c +++ b/menu/menu_animation.c @@ -591,14 +591,6 @@ bool menu_animation_ticker(const menu_animation_ctx_ticker_t *ticker) return true; } -bool menu_animation_get_ideal_delta_time(menu_animation_ctx_delta_t *delta) -{ - if (!delta) - return false; - delta->ideal = delta->current / IDEAL_DELTA_TIME; - return true; -} - void menu_animation_update_time(bool timedate_enable) { static retro_time_t @@ -686,9 +678,10 @@ void menu_animation_kill_by_subject(menu_animation_ctx_subject_t *subject) } } -float menu_animation_get_delta_time(void) +void menu_animation_get_time(menu_animation_ctx_delta_t *delta) { - return delta_time; + delta->current = delta_time; + delta->ideal = delta_time / IDEAL_DELTA_TIME; } bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data) diff --git a/menu/menu_animation.h b/menu/menu_animation.h index 64ca8a454e..56a5171655 100644 --- a/menu/menu_animation.h +++ b/menu/menu_animation.h @@ -143,7 +143,7 @@ void menu_animation_free(void); bool menu_animation_update(float delta_time); -bool menu_animation_get_ideal_delta_time(menu_animation_ctx_delta_t *delta); +void menu_animation_get_time(menu_animation_ctx_delta_t *delta); bool menu_animation_ticker(const menu_animation_ctx_ticker_t *ticker); @@ -159,8 +159,6 @@ bool menu_animation_push(menu_animation_ctx_entry_t *entry); void menu_animation_push_delayed(unsigned delay, menu_animation_ctx_entry_t *entry); -float menu_animation_get_delta_time(void); - bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data); RETRO_END_DECLS diff --git a/menu/menu_input.c b/menu/menu_input.c index 70a8b4e127..79b60938c6 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -235,10 +235,8 @@ unsigned menu_event(input_bits_t *p_input, input_bits_t *p_trigger_input) menu_driver_ctl(MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL, &new_scroll_accel); - delta.current = menu_animation_get_delta_time(); - - if (menu_animation_get_ideal_delta_time(&delta)) - delay_count += delta.ideal; + menu_animation_get_time(&delta); + delay_count += delta.ideal; if (menu_input_dialog_get_display_kb()) { diff --git a/retroarch.c b/retroarch.c index 79d7700a83..b0e60f4ed2 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2641,6 +2641,7 @@ static enum runloop_state runloop_check_state( bool rarch_is_initialized = rarch_ctl(RARCH_CTL_IS_INITED, NULL); bool fs_toggle_triggered = false; #ifdef HAVE_MENU + menu_animation_ctx_delta_t delta; bool menu_driver_binding_state = menu_driver_is_binding_state(); bool menu_is_alive = menu_driver_is_alive(); unsigned menu_toggle_gamepad_combo = settings->uints.input_menu_toggle_gamepad_combo; @@ -2828,14 +2829,8 @@ static enum runloop_state runloop_check_state( } #if defined(HAVE_MENU) - { - menu_animation_ctx_delta_t delta; - - delta.current = menu_animation_get_delta_time(); - - if (menu_animation_get_ideal_delta_time(&delta)) - menu_animation_update(delta.ideal); - } + menu_animation_get_time(&delta); + menu_animation_update(delta.ideal); if (menu_is_alive) {