From d86eb46f151ccbba1ea0538c874cf552055fb24e Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 14 Feb 2020 21:53:45 +0100
Subject: [PATCH] Cleanups

---
 menu/menu_animation.c | 13 +++++++------
 menu/menu_animation.h |  1 +
 retroarch.c           |  1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/menu/menu_animation.c b/menu/menu_animation.c
index 73d12becd7..deccf98a9e 100644
--- a/menu/menu_animation.c
+++ b/menu/menu_animation.c
@@ -1186,16 +1186,15 @@ bool menu_animation_push(menu_animation_ctx_entry_t *entry)
 }
 
 static void menu_animation_update_time(
+      unsigned type,
       bool timedate_enable,
       unsigned video_width, unsigned video_height,
       float menu_ticker_speed)
 {
+   static retro_time_t last_clock_update  = 0;
+   static retro_time_t last_ticker_update = 0;
    static retro_time_t
-      last_clock_update       = 0;
-   static retro_time_t
-      last_ticker_update      = 0;
-   static retro_time_t
-      last_ticker_slow_update = 0;
+      last_ticker_slow_update             = 0;
 
    static float ticker_pixel_accumulator  = 0.0f;
    unsigned ticker_pixel_accumulator_uint = 0;
@@ -1263,7 +1262,7 @@ static void menu_animation_update_time(
        *   system. We therefore take the same approach as GLUI,
        *   but with a different correction factor (expected
        *   scroll speed is somewhat lower for Ozone) */
-      switch (menu_driver_ident_id())
+      switch (type)
       {
          case MENU_DRIVER_ID_RGUI:
             ticker_pixel_increment *= 0.25f;
@@ -1295,6 +1294,7 @@ static void menu_animation_update_time(
 }
 
 bool menu_animation_update(
+      unsigned type,
       bool menu_timedate_enable,
       float menu_ticker_speed,
       unsigned video_width,
@@ -1303,6 +1303,7 @@ bool menu_animation_update(
    unsigned i;
 
    menu_animation_update_time(
+         type,
          menu_timedate_enable,
          video_width, video_height,
          menu_ticker_speed);
diff --git a/menu/menu_animation.h b/menu/menu_animation.h
index fc8ba770a8..2087665c74 100644
--- a/menu/menu_animation.h
+++ b/menu/menu_animation.h
@@ -199,6 +199,7 @@ void menu_timer_start(menu_timer_t *timer, menu_timer_ctx_entry_t *timer_entry);
 void menu_timer_kill(menu_timer_t *timer);
 
 bool menu_animation_update(
+      unsigned type,
       bool menu_timedate_enable,
       float menu_ticker_speed,
       unsigned video_width,
diff --git a/retroarch.c b/retroarch.c
index 29a2a9c75e..cada7d3922 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -27279,6 +27279,7 @@ static enum runloop_state runloop_check_state(void)
 
 #if defined(HAVE_MENU)
    menu_animation_update(
+         menu_driver_ident_id(),
          settings->bools.menu_timedate_enable,
          settings->floats.menu_ticker_speed,
          video_driver_width, video_driver_height);