From f3ff7f2a895323602fa9999a34e919eeb7f91433 Mon Sep 17 00:00:00 2001
From: natinusala <natinusala@gmail.com>
Date: Fri, 8 Feb 2019 20:02:45 +0100
Subject: [PATCH] menu_animations: make animations menu independent

---
 menu/drivers/materialui.c  | 6 ------
 menu/drivers/ozone/ozone.c | 6 ------
 menu/drivers/stripes.c     | 6 ------
 menu/drivers/xmb.c         | 6 ------
 retroarch.c                | 9 +++++++++
 5 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 613c5ef931..c96a32179d 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -643,7 +643,6 @@ static void materialui_compute_entries_box(materialui_handle_t* mui, int width)
    with acceleration */
 static void materialui_render(void *data, bool is_idle)
 {
-   menu_animation_ctx_delta_t delta;
    unsigned bottom, width, height, header_height;
    size_t        i             = 0;
    materialui_handle_t *mui    = (materialui_handle_t*)data;
@@ -662,11 +661,6 @@ static void materialui_render(void *data, bool is_idle)
       mui->need_compute = false;
    }
 
-   delta.current = menu_animation_get_delta_time();
-
-   if (menu_animation_get_ideal_delta_time(&delta))
-      menu_animation_update(delta.ideal);
-
    menu_display_set_width(width);
    menu_display_set_height(height);
    header_height = menu_display_get_header_height();
diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c
index 18ead24714..989605c6b5 100644
--- a/menu/drivers/ozone/ozone.c
+++ b/menu/drivers/ozone/ozone.c
@@ -932,7 +932,6 @@ static void ozone_compute_entries_position(ozone_handle_t *ozone)
 static void ozone_render(void *data, bool is_idle)
 {
    size_t i;
-   menu_animation_ctx_delta_t delta;
    unsigned end                     = (unsigned)menu_entries_get_size();
    ozone_handle_t *ozone            = (ozone_handle_t*)data;
    if (!data)
@@ -946,11 +945,6 @@ static void ozone_render(void *data, bool is_idle)
 
    ozone->selection = menu_navigation_get_selection();
 
-   delta.current = menu_animation_get_delta_time();
-
-   if (menu_animation_get_ideal_delta_time(&delta))
-      menu_animation_update(delta.ideal);
-
    /* TODO Handle pointer & mouse */
 
    menu_entries_ctl(MENU_ENTRIES_CTL_START_GET, &i);
diff --git a/menu/drivers/stripes.c b/menu/drivers/stripes.c
index 973401d2c0..134abbd611 100644
--- a/menu/drivers/stripes.c
+++ b/menu/drivers/stripes.c
@@ -2654,7 +2654,6 @@ static void stripes_draw_items(
 static void stripes_render(void *data, bool is_idle)
 {
    size_t i;
-   menu_animation_ctx_delta_t delta;
    settings_t   *settings   = config_get_ptr();
    stripes_handle_t *stripes        = (stripes_handle_t*)data;
    unsigned      end        = (unsigned)menu_entries_get_size();
@@ -2664,11 +2663,6 @@ static void stripes_render(void *data, bool is_idle)
    if (!stripes)
       return;
 
-   delta.current = menu_animation_get_delta_time();
-
-   if (menu_animation_get_ideal_delta_time(&delta))
-      menu_animation_update(delta.ideal);
-
    if (pointer_enable || mouse_enable)
    {
       size_t selection  = menu_navigation_get_selection();
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 0516ee5d49..9fb8a70b57 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -3140,7 +3140,6 @@ static void xmb_context_reset_internal(xmb_handle_t *xmb,
 static void xmb_render(void *data, bool is_idle)
 {
    size_t i;
-   menu_animation_ctx_delta_t delta;
    settings_t   *settings   = config_get_ptr();
    xmb_handle_t *xmb        = (xmb_handle_t*)data;
    unsigned      end        = (unsigned)menu_entries_get_size();
@@ -3163,11 +3162,6 @@ static void xmb_render(void *data, bool is_idle)
 
    xmb->previous_scale_factor = scale_factor;
 
-   delta.current = menu_animation_get_delta_time();
-
-   if (menu_animation_get_ideal_delta_time(&delta))
-      menu_animation_update(delta.ideal);
-
    if (pointer_enable || mouse_enable)
    {
       unsigned height;
diff --git a/retroarch.c b/retroarch.c
index 34003dd318..79d7700a83 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2828,6 +2828,15 @@ 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);
+   }
+
    if (menu_is_alive)
    {
       enum menu_action action;