From 99679001cb6202f66b505003f8bd516ff005ef20 Mon Sep 17 00:00:00 2001
From: TwinAphex51224 <twinaphex1@gmail.com>
Date: Fri, 22 Jun 2012 07:20:58 +0200
Subject: [PATCH] (360) Use rarch_input_get_default_keybind_name

---
 360/menu.cpp             | 12 ++++++------
 gfx/context/xdk360_ctx.h |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/360/menu.cpp b/360/menu.cpp
index fe9088eaf0..edc3cdf1fe 100644
--- a/360/menu.cpp
+++ b/360/menu.cpp
@@ -135,7 +135,7 @@ HRESULT CRetroArchControls::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
 
    for(i = 0; i < RARCH_FIRST_META_KEY; i++)
    {
-      snprintf(buttons[i], sizeof(buttons[i]), "%s #%d: %s", rarch_default_libretro_keybind_name_lut[i], controlno, rarch_input_find_platform_key_label(g_settings.input.binds[controlno][i].joykey));
+      snprintf(buttons[i], sizeof(buttons[i]), "%s #%d: %s", rarch_input_get_default_keybind_name(i), controlno, rarch_input_find_platform_key_label(g_settings.input.binds[controlno][i].joykey));
       rarch_convert_char_to_wchar(strw_buffer, buttons[i], sizeof(strw_buffer)); 
       m_controlslist.SetText(i, strw_buffer);
    }
@@ -154,7 +154,7 @@ HRESULT CRetroArchControls::OnControlNavigate(XUIMessageControlNavigate *pContro
 
    for(i = 0; i < RARCH_FIRST_META_KEY; i++)
    {
-      snprintf(buttons[i], sizeof(buttons[i]), "%s #%d: %s", rarch_default_libretro_keybind_name_lut[i], controlno, rarch_input_find_platform_key_label(g_settings.input.binds[controlno][i].joykey));
+      snprintf(buttons[i], sizeof(buttons[i]), "%s #%d: %s", rarch_input_get_default_keybind_name(i), controlno, rarch_input_find_platform_key_label(g_settings.input.binds[controlno][i].joykey));
       rarch_convert_char_to_wchar(strw_buffer, buttons[i], sizeof(strw_buffer));
       m_controlslist.SetText(i, strw_buffer);
    }
@@ -165,7 +165,7 @@ HRESULT CRetroArchControls::OnControlNavigate(XUIMessageControlNavigate *pContro
          if(current_index > 0 && current_index != SETTING_CONTROLS_DEFAULT_ALL)
          {
             rarch_input_set_keybind(controlno, KEYBIND_DECREMENT, current_index);
-            snprintf(button, sizeof(button), "%s #%d: %s", rarch_default_libretro_keybind_name_lut[current_index], controlno, rarch_input_find_platform_key_label(g_settings.input.binds[controlno][current_index].joykey));
+            snprintf(button, sizeof(button), "%s #%d: %s", rarch_input_get_default_keybind_name(current_index), controlno, rarch_input_find_platform_key_label(g_settings.input.binds[controlno][current_index].joykey));
             rarch_convert_char_to_wchar(strw_buffer, button, sizeof(strw_buffer));
             m_controlslist.SetText(current_index, strw_buffer);
          }
@@ -174,7 +174,7 @@ HRESULT CRetroArchControls::OnControlNavigate(XUIMessageControlNavigate *pContro
          if(current_index < RARCH_FIRST_META_KEY && current_index != SETTING_CONTROLS_DEFAULT_ALL)
          {
             rarch_input_set_keybind(controlno, KEYBIND_INCREMENT, current_index);
-            snprintf(button, sizeof(button), "%s #%d: %s", rarch_default_libretro_keybind_name_lut[current_index], controlno, rarch_input_find_platform_key_label(g_settings.input.binds[controlno][current_index].joykey));
+            snprintf(button, sizeof(button), "%s #%d: %s", rarch_input_get_default_keybind_name(current_index), controlno, rarch_input_find_platform_key_label(g_settings.input.binds[controlno][current_index].joykey));
             rarch_convert_char_to_wchar(strw_buffer, button, sizeof(strw_buffer));
             m_controlslist.SetText(current_index, strw_buffer);
          }
@@ -204,14 +204,14 @@ HRESULT CRetroArchControls::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled
 
             for(i = 0; i < RARCH_FIRST_META_KEY; i++)
             {
-               snprintf(buttons[i], sizeof(buttons[i]), "%s #%d: %s", rarch_default_libretro_keybind_name_lut[i], controlno, rarch_input_find_platform_key_label(g_settings.input.binds[controlno][i].joykey));
+               snprintf(buttons[i], sizeof(buttons[i]), "%s #%d: %s", rarch_input_get_default_keybind_name(i), controlno, rarch_input_find_platform_key_label(g_settings.input.binds[controlno][i].joykey));
                rarch_convert_char_to_wchar(strw_buffer, buttons[i], sizeof(strw_buffer));
                m_controlslist.SetText(i, strw_buffer);
             }
             break;
          default:
             rarch_input_set_keybind(controlno, KEYBIND_DEFAULT, current_index);
-            snprintf(buttons[current_index], sizeof(buttons[current_index]), "%s #%d: %s", rarch_default_libretro_keybind_name_lut[current_index], controlno, rarch_input_find_platform_key_label(g_settings.input.binds[controlno][current_index].joykey));
+            snprintf(buttons[current_index], sizeof(buttons[current_index]), "%s #%d: %s", rarch_input_get_default_keybind_name(current_index), controlno, rarch_input_find_platform_key_label(g_settings.input.binds[controlno][current_index].joykey));
             rarch_convert_char_to_wchar(strw_buffer, buttons[current_index], sizeof(strw_buffer));
             m_controlslist.SetText(current_index, strw_buffer);
             break;
diff --git a/gfx/context/xdk360_ctx.h b/gfx/context/xdk360_ctx.h
index 4764acb116..363123953a 100644
--- a/gfx/context/xdk360_ctx.h
+++ b/gfx/context/xdk360_ctx.h
@@ -17,6 +17,8 @@
 #ifndef _XDK360_CTX_H
 #define _XDK360_CTX_H
 
+#include "../../360/xdk360_video.h"
+
 void gfx_ctx_set_projection(xdk360_video_t *d3d9, const struct gl_ortho *ortho, bool allow_rotate);
 void gfx_ctx_set_aspect_ratio(void *data, unsigned aspectratio_index);
 void gfx_ctx_set_overscan(void);