From e602f534c7e7ba1bbce500e4b30e129625f605bf Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 15 Sep 2016 20:52:08 +0200
Subject: [PATCH] menu_input_bind_dialog.c - more refactors

---
 menu/menu_input.c                     |  4 ----
 menu/menu_input.h                     |  5 +----
 menu/menu_setting.c                   |  2 +-
 menu/widgets/menu_input_bind_dialog.c | 12 +++++-------
 menu/widgets/menu_input_bind_dialog.h |  9 ++++++++-
 setting_list.c                        |  3 ++-
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/menu/menu_input.c b/menu/menu_input.c
index cbe18a3152..799aa358ef 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -198,10 +198,6 @@ bool menu_input_ctl(enum menu_input_ctl_state state, void *data)
       case MENU_INPUT_CTL_UNSET_POINTER_DRAGGED:
          pointer_dragging = false;
          break;
-      case MENU_INPUT_CTL_BIND_NONE:
-      case MENU_INPUT_CTL_BIND_SINGLE:
-      case MENU_INPUT_CTL_BIND_ALL:
-         return menu_input_key_bind_set_mode(state, data);
       default:
       case MENU_INPUT_CTL_NONE:
          break;
diff --git a/menu/menu_input.h b/menu/menu_input.h
index 1e900b8da9..e164be45da 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -76,10 +76,7 @@ enum menu_input_ctl_state
    MENU_INPUT_CTL_IS_POINTER_DRAGGED,
    MENU_INPUT_CTL_SET_POINTER_DRAGGED,
    MENU_INPUT_CTL_UNSET_POINTER_DRAGGED,
-   MENU_INPUT_CTL_DEINIT,
-   MENU_INPUT_CTL_BIND_NONE,
-   MENU_INPUT_CTL_BIND_SINGLE,
-   MENU_INPUT_CTL_BIND_ALL
+   MENU_INPUT_CTL_DEINIT
 };
 
 typedef struct menu_input_ctx_hitbox
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 0dbe9b1a15..930e1ec756 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -1242,7 +1242,7 @@ static int setting_action_right_bind_device(void *data, bool wraparound)
 static int setting_action_ok_bind_all(void *data, bool wraparound)
 {
    (void)wraparound;
-   if (!menu_input_ctl(MENU_INPUT_CTL_BIND_ALL, data))
+   if (!menu_input_key_bind_set_mode(MENU_INPUT_BINDS_CTL_BIND_ALL, data))
       return -1;
    return 0;
 }
diff --git a/menu/widgets/menu_input_bind_dialog.c b/menu/widgets/menu_input_bind_dialog.c
index 9fbaf14d03..d24bd9189f 100644
--- a/menu/widgets/menu_input_bind_dialog.c
+++ b/menu/widgets/menu_input_bind_dialog.c
@@ -78,7 +78,7 @@ static bool menu_input_key_bind_custom_bind_keyboard_cb(
 }
 
 static int menu_input_key_bind_set_mode_common(
-      enum menu_input_ctl_state state,
+      enum menu_input_binds_ctl_state state,
       rarch_setting_t  *setting)
 {
    size_t selection;
@@ -98,9 +98,7 @@ static int menu_input_key_bind_set_mode_common(
 
    switch (state)
    {
-      case MENU_INPUT_CTL_BIND_NONE:
-         return -1;
-      case MENU_INPUT_CTL_BIND_SINGLE:
+      case MENU_INPUT_BINDS_CTL_BIND_SINGLE:
          keybind    = (struct retro_keybind*)setting_get_ptr(setting);
 
          if (!keybind)
@@ -123,7 +121,7 @@ static int menu_input_key_bind_set_mode_common(
          if (menu_displaylist_ctl(DISPLAYLIST_INFO, &info))
             menu_displaylist_ctl(DISPLAYLIST_PROCESS, &info);
          break;
-      case MENU_INPUT_CTL_BIND_ALL:
+      case MENU_INPUT_BINDS_CTL_BIND_ALL:
          menu_input_binds.target = &settings->input.binds
             [index_offset][0];
          menu_input_binds.begin  = MENU_SETTINGS_BIND_BEGIN;
@@ -141,7 +139,7 @@ static int menu_input_key_bind_set_mode_common(
             menu_displaylist_ctl(DISPLAYLIST_PROCESS, &info);
          break;
       default:
-      case MENU_INPUT_CTL_NONE:
+      case MENU_INPUT_BINDS_CTL_BIND_NONE:
          break;
    }
 
@@ -236,7 +234,7 @@ static void menu_input_key_bind_poll_bind_state(
 }
 
 bool menu_input_key_bind_set_mode(
-      enum menu_input_ctl_state state, void *data)
+      enum menu_input_binds_ctl_state state, void *data)
 {
    unsigned index_offset;
    input_keyboard_ctx_wait_t keys;
diff --git a/menu/widgets/menu_input_bind_dialog.h b/menu/widgets/menu_input_bind_dialog.h
index 30e10f2545..58c08fcb16 100644
--- a/menu/widgets/menu_input_bind_dialog.h
+++ b/menu/widgets/menu_input_bind_dialog.h
@@ -28,6 +28,13 @@
 
 RETRO_BEGIN_DECLS
 
+enum menu_input_binds_ctl_state
+{
+   MENU_INPUT_BINDS_CTL_BIND_NONE = 0,
+   MENU_INPUT_BINDS_CTL_BIND_SINGLE,
+   MENU_INPUT_BINDS_CTL_BIND_ALL
+};
+
 typedef struct menu_input_ctx_bind
 {
    char *s;
@@ -41,7 +48,7 @@ typedef struct menu_input_ctx_bind_limits
 } menu_input_ctx_bind_limits_t;
 
 bool menu_input_key_bind_set_mode(
-      enum menu_input_ctl_state state, void *data);
+      enum menu_input_binds_ctl_state state, void *data);
 
 bool menu_input_key_bind_set_min_max(menu_input_ctx_bind_limits_t *lim);
 
diff --git a/setting_list.c b/setting_list.c
index 68fb25d451..683a64c8c3 100644
--- a/setting_list.c
+++ b/setting_list.c
@@ -26,6 +26,7 @@
 #ifdef HAVE_MENU
 #include "menu/menu_driver.h"
 #include "menu/widgets/menu_input_dialog.h"
+#include "menu/widgets/menu_input_bind_dialog.h"
 #endif
 
 #include "configuration.h"
@@ -141,7 +142,7 @@ static int setting_bind_action_ok(void *data, bool wraparound)
 
 #ifdef HAVE_MENU
    /* TODO - get rid of menu dependency */
-   if (!menu_input_ctl(MENU_INPUT_CTL_BIND_SINGLE, data))
+   if (!menu_input_key_bind_set_mode(MENU_INPUT_BINDS_CTL_BIND_SINGLE, data))
       return -1;
 #endif
    return 0;