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

View File

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

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);
bool (*key_pressed)(void *data, int key);
void (*free)(void *data);
#ifdef RARCH_CONSOLE
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);
#endif
const char *ident;

View File

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

View File

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

View File

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

View File

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