From 2553bbcd91e76bd52ee9ca453080e4328ff6d98e Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 15 Jun 2015 02:22:36 +0200
Subject: [PATCH] Move menu->delay to menu->input.delay

---
 menu/menu_driver.h |  7 -------
 menu/menu_input.c  | 18 +++++++-----------
 menu/menu_input.h  |  7 +++++++
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index bdaffd4fca..35287e353c 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -46,13 +46,6 @@ typedef struct
 {
    void *userdata;
 
-   /* Used for key repeat */
-   struct
-   {
-      float timer;
-      float count;
-   } delay;
-
    size_t begin;
    float scroll_y;
 
diff --git a/menu/menu_input.c b/menu/menu_input.c
index c9729cb0f9..93d23f0f98 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -1011,11 +1011,11 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
       if (!first_held)
       {
          first_held = true;
-         menu->delay.timer = initial_held ? 12 : 6;
-         menu->delay.count = 0;
+         menu->input.delay.timer = initial_held ? 12 : 6;
+         menu->input.delay.count = 0;
       }
 
-      if (menu->delay.count >= menu->delay.timer)
+      if (menu->input.delay.count >= menu->input.delay.timer)
       {
          first_held = false;
          trigger_input |= input & input_repeat;
@@ -1032,7 +1032,7 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
       nav->scroll.acceleration = 0;
    }
 
-   menu->delay.count += menu->animation->delta_time / IDEAL_DT;
+   menu->input.delay.count += menu->animation->delta_time / IDEAL_DT;
 
    if (driver->block_input)
       trigger_input = 0;
@@ -1070,13 +1070,9 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
 
    if (settings->menu.pointer.enable)
       menu_input_pointer(&ret);
-      
+
    if (trigger_input && menu_ctx_driver_get_ptr()->perform_action && menu_ctx_driver_get_ptr()->perform_action(menu->userdata, ret))
-   {
       return MENU_ACTION_NOOP;
-   }
-   else
-   {
-      return ret;
-   }
+
+   return ret;
 }
diff --git a/menu/menu_input.h b/menu/menu_input.h
index c678002ea5..41ca2a9c4c 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -168,6 +168,13 @@ typedef struct menu_input
       unsigned type;
       unsigned idx;
    } keyboard;
+
+   /* Used for key repeat */
+   struct
+   {
+      float timer;
+      float count;
+   } delay;
 } menu_input_t;
 
 void menu_input_key_event(bool down, unsigned keycode, uint32_t character,