From 2e0902fda19d7139b6dfd5f222b49fb5dad25a80 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 24 Feb 2015 03:06:25 +0100
Subject: [PATCH] Revert "(Menu) Delta timing"

This reverts commit 24f7acb93c5c62c2023cc6f2708cfdacae494e86.
---
 menu/drivers/xmb.c | 2 +-
 menu/menu.c        | 7 -------
 menu/menu_driver.h | 9 ++-------
 menu/menu_input.c  | 2 +-
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index ed73dc043c..393f706192 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1136,7 +1136,7 @@ static void xmb_frame(void)
    if (!gl)
       return;
 
-   menu_animation_update(menu->animation, menu->dt / 7500000.0);
+   menu_animation_update(menu->animation, 0.002);
 
    glViewport(0, 0, gl->win_width, gl->win_height);
 
diff --git a/menu/menu.c b/menu/menu.c
index 5bcbdd0de0..8356b903f7 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -21,7 +21,6 @@
 #include "../dynamic.h"
 #include "../frontend/frontend.h"
 #include "../../retroarch.h"
-#include "../../performance.h"
 #include <file/file_path.h>
 
 /**
@@ -378,12 +377,6 @@ int menu_iterate(retro_input_t input,
    int32_t ret     = 0;
    unsigned action = menu_input_frame(input, trigger_input);
 
-   menu_handle_t   *menu = menu_driver_resolve();
-
-   menu->cur_time = rarch_get_time_usec();
-   menu->dt = menu->cur_time - menu->old_time;
-   menu->old_time = menu->cur_time;
-
    if (driver.menu_ctx)
    {
       if (driver.menu_ctx->set_texture)
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index cac76855f7..52986889ae 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -98,16 +98,11 @@ typedef struct
 {
    void *userdata;
 
-   /* Delta timing */
-   float dt;
-   float cur_time;
-   float old_time;
-
    /* Used for key repeat */
    struct
    {
-      float timer;
-      float count;
+      unsigned timer;
+      unsigned count;
    } delay;
 
    size_t begin;
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 7de8bf1396..0318c15e9d 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -497,7 +497,7 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
 
    menu->mouse.enable = g_settings.menu.mouse_enable;
 
-   menu->delay.count += menu->dt / 10000.0;
+   menu->delay.count++;
 
    if (driver.block_input)
       trigger_input = 0;