mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-24 04:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass device pointer to input_remapping_state

Browse Source
This commit is contained in:
twinaphex 2015-04-10 03:10:01 +02:00
parent a0d0345f36
commit 9d74dbdef6
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/input_remapping.c
View File

@ -129,7 +129,7 @@ void input_remapping_set_defaults(void)
} }
void input_remapping_state(unsigned port, void input_remapping_state(unsigned port,
unsigned device, unsigned *idx, unsigned *id) unsigned *device, unsigned *idx, unsigned *id)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();

2
input/input_remapping.h
View File

@ -47,7 +47,7 @@ bool input_remapping_save_file(const char *path);
void input_remapping_set_defaults(void); void input_remapping_set_defaults(void);
void input_remapping_state(unsigned port, void input_remapping_state(unsigned port,
unsigned device, unsigned *idx, unsigned *id); unsigned *device, unsigned *idx, unsigned *id);
#ifdef __cplusplus #ifdef __cplusplus
} }

3
libretro_version_1.c
View File

@ -30,6 +30,7 @@
#include "retroarch.h" #include "retroarch.h"
#include "performance.h" #include "performance.h"
#include "input/keyboard_line.h" #include "input/keyboard_line.h"
#include "input/input_remapping.h"
#include "audio/audio_utils.h" #include "audio/audio_utils.h"
#include "retroarch_logger.h" #include "retroarch_logger.h"
#include "record/record_driver.h" #include "record/record_driver.h"
@ -432,7 +433,7 @@ static int16_t input_state(unsigned port, unsigned device,
} }
if (settings->input.remap_binds_enable) if (settings->input.remap_binds_enable)
input_remapping_state(port, device, &idx, &id); input_remapping_state(port, &device, &idx, &id);
if (!driver->block_libretro_input) if (!driver->block_libretro_input)