ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move set_default_keybinds upstream (no longer ifdeffed RARCH_CONSOLE)

This commit is contained in:
twinaphex 2013-03-13 16:33:39 +01:00
parent ece717f2cc
commit d7130d58f6
6 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/native/jni/input_android.c
View File

@ -520,5 +520,6 @@ const input_driver_t input_android = {
android_input_state, android_input_state,
android_input_key_pressed, android_input_key_pressed,
android_input_free_input, android_input_free_input,
NULL,
"android_input", "android_input",
}; };

2
driver.h
View File

@ -206,8 +206,8 @@ typedef struct input_driver
int16_t (*input_state)(void *data, const struct retro_keybind **retro_keybinds, unsigned port, unsigned device, unsigned index, unsigned id); int16_t (*input_state)(void *data, const struct retro_keybind **retro_keybinds, unsigned port, unsigned device, unsigned index, unsigned id);
bool (*key_pressed)(void *data, int key); bool (*key_pressed)(void *data, int key);
void (*free)(void *data); void (*free)(void *data);
#ifdef RARCH_CONSOLE
void (*set_default_keybinds)(unsigned device, unsigned port); void (*set_default_keybinds)(unsigned device, unsigned port);
#ifdef RARCH_CONSOLE
void (*set_analog_dpad_mapping)(unsigned device, unsigned map_dpad_enum, unsigned controller_id); void (*set_analog_dpad_mapping)(unsigned device, unsigned map_dpad_enum, unsigned controller_id);
#endif #endif
const char *ident; const char *ident;

1
input/linuxraw_input.c
View File

@ -315,5 +315,6 @@ const input_driver_t input_linuxraw = {
linuxraw_input_state, linuxraw_input_state,
linuxraw_bind_button_pressed, linuxraw_bind_button_pressed,
linuxraw_input_free, linuxraw_input_free,
NULL,
"linuxraw" "linuxraw"
}; };

2
input/null.c
View File

@ -72,8 +72,8 @@ const input_driver_t input_null = {
nullinput_input_state, nullinput_input_state,
nullinput_input_key_pressed, nullinput_input_key_pressed,
nullinput_input_free_input, nullinput_input_free_input,
#ifdef RARCH_CONSOLE
nullinput_set_default_keybinds, nullinput_set_default_keybinds,
#ifdef RARCH_CONSOLE
nullinput_set_analog_dpad_mapping, nullinput_set_analog_dpad_mapping,
#endif #endif
"null", "null",

1
input/sdl_input.c
View File

@ -245,6 +245,7 @@ const input_driver_t input_sdl = {
sdl_input_state, sdl_input_state,
sdl_bind_button_pressed, sdl_bind_button_pressed,
sdl_input_free, sdl_input_free,
NULL,
"sdl", "sdl",
}; };

1
input/x11_input.c
View File

@ -250,6 +250,7 @@ const input_driver_t input_x = {
x_input_state, x_input_state,
x_bind_button_pressed, x_bind_button_pressed,
x_input_free, x_input_free,
NULL,
"x" "x"
}; };