From a0d0345f3693711c7f73b9119df668a5a287d87d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 10 Apr 2015 02:46:10 +0200
Subject: [PATCH] Create input_remapping_state

---
 input/input_remapping.c | 9 +++++++++
 input/input_remapping.h | 3 +++
 libretro_version_1.c    | 6 ++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/input/input_remapping.c b/input/input_remapping.c
index 9430cac6a2..44d857e5d6 100644
--- a/input/input_remapping.c
+++ b/input/input_remapping.c
@@ -127,3 +127,12 @@ void input_remapping_set_defaults(void)
          settings->input.remap_ids[i][j] = settings->input.binds[i][j].id;
    }
 }
+
+void input_remapping_state(unsigned port,
+      unsigned device, unsigned *idx, unsigned *id)
+{
+   settings_t *settings           = config_get_ptr();
+
+   if (*id < RARCH_FIRST_META_KEY)
+      *id = settings->input.remap_ids[port][*id];
+}
diff --git a/input/input_remapping.h b/input/input_remapping.h
index a465239848..453741f138 100644
--- a/input/input_remapping.h
+++ b/input/input_remapping.h
@@ -46,6 +46,9 @@ bool input_remapping_save_file(const char *path);
 
 void input_remapping_set_defaults(void);
 
+void input_remapping_state(unsigned port,
+      unsigned device, unsigned *idx, unsigned *id);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libretro_version_1.c b/libretro_version_1.c
index 2ccc3e2abb..c6004ae23c 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -432,10 +432,8 @@ static int16_t input_state(unsigned port, unsigned device,
    }
 
    if (settings->input.remap_binds_enable)
-   {
-      if (id < RARCH_FIRST_META_KEY)
-         id = settings->input.remap_ids[port][id];
-   }
+      input_remapping_state(port, device, &idx, &id);
+
    if (!driver->block_libretro_input)
 
    {