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

Rename set_default_keybind_lut to set_default_keybinds

This commit is contained in:
twinaphex 2013-03-13 16:30:01 +01:00
parent 4bd0999940
commit ece717f2cc
10 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver.h
View File

@ -207,7 +207,7 @@ typedef struct input_driver
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 #ifdef RARCH_CONSOLE
void (*set_default_keybind_lut)(unsigned device, unsigned port); void (*set_default_keybinds)(unsigned device, unsigned port);
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;

3
frontend/menu/rgui.c
View File

@ -899,7 +899,8 @@ static int rgui_settings_toggle_setting(unsigned setting, rgui_action_t action,
else if (action == RGUI_ACTION_RIGHT) else if (action == RGUI_ACTION_RIGHT)
g_settings.input.device[port]++; g_settings.input.device[port]++;
g_settings.input.device[port] %= RARCH_DEVICE_LAST; g_settings.input.device[port] %= RARCH_DEVICE_LAST;
driver.input->set_default_keybind_lut(g_settings.input.device[port], port); if (driver.input->set_default_keybinds)
driver.input->set_default_keybinds(g_settings.input.device[port], port);
driver.input->set_analog_dpad_mapping(g_settings.input.device[port], g_settings.input.dpad_emulation[port], port); driver.input->set_analog_dpad_mapping(g_settings.input.device[port], g_settings.input.dpad_emulation[port], port);
break; break;
#endif #endif

3
frontend/menu/rmenu.c
View File

@ -2041,7 +2041,8 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
#endif #endif
case SETTING_CONTROLS_DEFAULT_ALL: case SETTING_CONTROLS_DEFAULT_ALL:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)) || (input & (1ULL << RMENU_DEVICE_NAV_START))) if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)) || (input & (1ULL << RMENU_DEVICE_NAV_START)))
driver.input->set_default_keybind_lut(g_settings.input.device[currently_selected_controller_menu], currently_selected_controller_menu); if (driver.input->set_default_keybinds)
driver.input->set_default_keybinds(g_settings.input.device[currently_selected_controller_menu], currently_selected_controller_menu);
break; break;
} }

3
frontend/menu/rmenu_xui.cpp
View File

@ -534,7 +534,8 @@ HRESULT CRetroArchControls::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
case SETTING_CONTROLS_DPAD_EMULATION: case SETTING_CONTROLS_DPAD_EMULATION:
break; break;
case SETTING_CONTROLS_DEFAULT_ALL: case SETTING_CONTROLS_DEFAULT_ALL:
driver.input->set_default_keybind_lut(g_settings.input.device[controlno], controlno); if (driver.input->set_default_keybinds)
driver.input->set_default_keybinds(g_settings.input.device[controlno], controlno);
for(i = 0; i < RARCH_FIRST_META_KEY; i++) for(i = 0; i < RARCH_FIRST_META_KEY; i++)
{ {

6
gx/gx_input.c
View File

@ -242,7 +242,7 @@ static void gx_input_set_analog_dpad_mapping(unsigned device, unsigned map_dpad_
} }
} }
static void gx_set_default_keybind_lut(unsigned device, unsigned port) static void gx_set_default_keybinds(unsigned device, unsigned port)
{ {
switch (device) switch (device)
{ {
@ -343,7 +343,7 @@ static void *gx_input_init(void)
#endif #endif
for(unsigned i = 0; i < MAX_PLAYERS; i++) for(unsigned i = 0; i < MAX_PLAYERS; i++)
gx_set_default_keybind_lut(0, i); gx_set_default_keybinds(0, i);
for(unsigned i = 0; i < MAX_PADS; i++) for(unsigned i = 0; i < MAX_PADS; i++)
gx_input_set_analog_dpad_mapping(g_settings.input.device[i], g_settings.input.dpad_emulation[i], i); gx_input_set_analog_dpad_mapping(g_settings.input.device[i], g_settings.input.dpad_emulation[i], i);
@ -642,7 +642,7 @@ const input_driver_t input_gx = {
.input_state = gx_input_state, .input_state = gx_input_state,
.key_pressed = gx_input_key_pressed, .key_pressed = gx_input_key_pressed,
.free = gx_input_free_input, .free = gx_input_free_input,
.set_default_keybind_lut = gx_set_default_keybind_lut, .set_default_keybinds = gx_set_default_keybinds,
.set_analog_dpad_mapping = gx_input_set_analog_dpad_mapping, .set_analog_dpad_mapping = gx_input_set_analog_dpad_mapping,
.ident = "gx", .ident = "gx",
}; };

5
input/null.c
View File

@ -52,7 +52,7 @@ static void nullinput_input_free_input(void *data)
} }
#ifdef RARCH_CONSOLE #ifdef RARCH_CONSOLE
static void nullinput_set_default_keybind_lut(unsigned device, unsigned port) static void nullinput_set_default_keybinds(unsigned device, unsigned port)
{ {
(void)device; (void)device;
(void)port; (void)port;
@ -73,9 +73,8 @@ const input_driver_t input_null = {
nullinput_input_key_pressed, nullinput_input_key_pressed,
nullinput_input_free_input, nullinput_input_free_input,
#ifdef RARCH_CONSOLE #ifdef RARCH_CONSOLE
nullinput_set_default_keybind_lut, nullinput_set_default_keybinds,
nullinput_set_analog_dpad_mapping, nullinput_set_analog_dpad_mapping,
2,
#endif #endif
"null", "null",
}; };

6
ps3/ps3_input.c
View File

@ -427,7 +427,7 @@ static void ps3_input_free_input(void *data)
//cellPadEnd(); //cellPadEnd();
} }
static void ps3_set_default_keybind_lut(unsigned device, unsigned port) static void ps3_set_default_keybinds(unsigned device, unsigned port)
{ {
(void)device; (void)device;
@ -449,7 +449,7 @@ static void* ps3_input_init(void)
#endif #endif
for(unsigned i = 0; i < MAX_PLAYERS; i++) for(unsigned i = 0; i < MAX_PLAYERS; i++)
ps3_set_default_keybind_lut(0, i); ps3_set_default_keybinds(0, i);
for (unsigned i = 0; i < MAX_PADS; i++) for (unsigned i = 0; i < MAX_PADS; i++)
ps3_input_set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[i], i); ps3_input_set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[i], i);
@ -468,7 +468,7 @@ const input_driver_t input_ps3 = {
.input_state = ps3_input_state, .input_state = ps3_input_state,
.key_pressed = ps3_input_key_pressed, .key_pressed = ps3_input_key_pressed,
.free = ps3_input_free_input, .free = ps3_input_free_input,
.set_default_keybind_lut = ps3_set_default_keybind_lut, .set_default_keybinds = ps3_set_default_keybinds,
.set_analog_dpad_mapping = ps3_input_set_analog_dpad_mapping, .set_analog_dpad_mapping = ps3_input_set_analog_dpad_mapping,
.ident = "ps3", .ident = "ps3",
}; };

6
psp/psp_input.c
View File

@ -151,7 +151,7 @@ static void psp_free_input(void *data)
(void)data; (void)data;
} }
static void psp_set_default_keybind_lut(unsigned device, unsigned port) static void psp_set_default_keybinds(unsigned device, unsigned port)
{ {
(void)device; (void)device;
@ -171,7 +171,7 @@ static void* psp_input_initialize(void)
sceCtrlSetSamplingMode(DEFAULT_SAMPLING_MODE); sceCtrlSetSamplingMode(DEFAULT_SAMPLING_MODE);
for(unsigned i = 0; i < MAX_PLAYERS; i++) for(unsigned i = 0; i < MAX_PLAYERS; i++)
psp_set_default_keybind_lut(0, i); psp_set_default_keybinds(0, i);
return (void*)-1; return (void*)-1;
} }
@ -196,7 +196,7 @@ const input_driver_t input_psp = {
.input_state = psp_input_state, .input_state = psp_input_state,
.key_pressed = psp_key_pressed, .key_pressed = psp_key_pressed,
.free = psp_free_input, .free = psp_free_input,
.set_default_keybind_lut = psp_set_default_keybind_lut, .set_default_keybinds = psp_set_default_keybinds,
.set_analog_dpad_mapping = psp_input_set_analog_dpad_mapping, .set_analog_dpad_mapping = psp_input_set_analog_dpad_mapping,
.ident = "psp", .ident = "psp",
}; };

6
xdk/xdk_xinput_input.c
View File

@ -269,7 +269,7 @@ static void xdk_input_free_input(void *data)
(void)data; (void)data;
} }
static void xdk_set_default_keybind_lut(unsigned device, unsigned port) static void xdk_set_default_keybinds(unsigned device, unsigned port)
{ {
(void)device; (void)device;
@ -335,7 +335,7 @@ static void *xdk_input_init(void)
#endif #endif
for(unsigned i = 0; i < MAX_PLAYERS; i++) for(unsigned i = 0; i < MAX_PLAYERS; i++)
xdk_set_default_keybind_lut(0, i); xdk_set_default_keybinds(0, i);
for(unsigned i = 0; i < MAX_PADS; i++) for(unsigned i = 0; i < MAX_PADS; i++)
xdk_input_set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[i], i); xdk_input_set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[i], i);
@ -355,7 +355,7 @@ const input_driver_t input_xinput =
xdk_input_state, xdk_input_state,
xdk_input_key_pressed, xdk_input_key_pressed,
xdk_input_free_input, xdk_input_free_input,
xdk_set_default_keybind_lut, xdk_set_default_keybinds,
xdk_input_set_analog_dpad_mapping, xdk_input_set_analog_dpad_mapping,
"xinput" "xinput"
}; };

6
xenon/xenon360_input.c
View File

@ -82,7 +82,7 @@ static void xenon360_input_free_input(void *data)
(void)data; (void)data;
} }
static void xenon360_input_set_default_keybind_lut(unsigned device, unsigned port) static void xenon360_input_set_default_keybinds(unsigned device, unsigned port)
{ {
(void)device; (void)device;
@ -105,7 +105,7 @@ static void xenon360_input_set_analog_dpad_mapping(unsigned device, unsigned map
static void* xenon360_input_init(void) static void* xenon360_input_init(void)
{ {
for(unsigned i = 0; i < MAX_PLAYERS; i++) for(unsigned i = 0; i < MAX_PLAYERS; i++)
xenon360_input_set_default_keybind_lut(0, i); xenon360_input_set_default_keybinds(0, i);
for(unsigned i = 0; i < MAX_PADS; i++) for(unsigned i = 0; i < MAX_PADS; i++)
xenon360_input_set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[i], i); xenon360_input_set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[i], i);
@ -125,7 +125,7 @@ const input_driver_t input_xenon360 = {
.input_state = xenon360_input_state, .input_state = xenon360_input_state,
.key_pressed = xenon360_input_key_pressed, .key_pressed = xenon360_input_key_pressed,
.free = xenon360_input_free_input, .free = xenon360_input_free_input,
.set_default_keybind_lut = xenon360_input_set_default_keybind_lut, .set_default_keybinds = xenon360_input_set_default_keybinds,
.set_analog_dpad_mapping = xenon360_input_set_analog_dpad_mapping, .set_analog_dpad_mapping = xenon360_input_set_analog_dpad_mapping,
.ident = "xenon360", .ident = "xenon360",
}; };